Commit a0c77227 authored Mar 01, 2015 by Sven Eckelmann Committed by Antonio Quartulli Jun 03, 2015

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>

parent 21102626

net/batman-adv/bat_iv_ogm.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1357,7 +1357,6 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
	out:		out:
	spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock);		spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock);
	batadv_orig_node_free_ref(orig_node);		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;		return ret;
	}		}