[B.A.T.M.A.N.] [PATCH] batman-adv: Remove unnecessary check for orig_ifinfo == NULL

[B.A.T.M.A.N.] [PATCH] batman-adv: Remove unnecessary check for orig_ifinfo == NULL

[Sven Eckelmann]

orig_ifinfo is dereferenced multiple times in batadv_iv_ogm_update_seqnos
before the check for NULL is done. The function also exists at the beginning
when orig_ifinfo would have been NULL. This makes the check at the end
unnecessary and only confuses the reader/code analyzers.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 bat_iv_ogm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index 554e0e0..04bd220 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
@@ -1357,8 +1357,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
 out:
 	spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock);
 	batadv_orig_node_free_ref(orig_node);
-	if (orig_ifinfo)
-		batadv_orig_ifinfo_free_ref(orig_ifinfo);
+	batadv_orig_ifinfo_free_ref(orig_ifinfo);
 	return ret;
 }
 
-- 
2.1.4

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Remove unnecessary check for orig_ifinfo == NULL

[Marek Lindner]

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

On Sunday, March 01, 2015 16:56:26 Sven Eckelmann wrote:
> orig_ifinfo is dereferenced multiple times in batadv_iv_ogm_update_seqnos
> before the check for NULL is done. The function also exists at the beginning
> when orig_ifinfo would have been NULL. This makes the check at the end
> unnecessary and only confuses the reader/code analyzers.
> 
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> ---
>  bat_iv_ogm.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Applied in revision 8435e41.

Thanks,
Marek

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 473 bytes --]