batman-adv: Remove unnecessary check for orig_ifinfo not NULL
authorSven Eckelmann <sven@narfation.org>
Sun, 1 Mar 2015 15:56:26 +0000 (16:56 +0100)
committerAntonio Quartulli <antonio@meshcoding.com>
Wed, 3 Jun 2015 13:57:23 +0000 (15:57 +0200)
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>
net/batman-adv/bat_iv_ogm.c

index 9f83137a65149025d9108597660e392ab0fdd69b..4e93d2d3958b42f4ecebf79989ab2b9617c0ef13 100644 (file)
@@ -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;
 }