From: Sven Eckelmann <sven@narfation.org>
Date: Sun, 1 Mar 2015 15:56:26 +0000 (+0100)
Subject: batman-adv: Remove unnecessary check for orig_ifinfo not NULL
X-Git-Tag: v4.2-rc1~130^2~141^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0c77227ffd0ad371cfde84458f440bcde5ab048;p=platform%2Fkernel%2Flinux-exynos.git

batman-adv: Remove unnecessary check for orig_ifinfo not NULL

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>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 9f83137..4e93d2d 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/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;
 }