[linux-next] LinuxNextTracking branch, master, updated. next-20160111

batman at open-mesh.org batman at open-mesh.org
Tue Jan 12 00:15:46 CET 2016

The following commit has been merged in the master branch:
commit f75a33aeed0776f52da05276c2ef98e16d680a6b
Author: Markus Elfring <elfring at users.sourceforge.net>
Date:   Tue Nov 3 19:20:34 2015 +0100

    batman-adv: Delete an unnecessary check before the function call "batadv_softif_vlan_free_ref"
    The batadv_softif_vlan_free_ref() function tests whether its argument is NULL
    and then returns immediately. Thus the test around the call is not needed.
    This issue was detected by using the Coccinelle software.
    Signed-off-by: Markus Elfring <elfring at users.sourceforge.net>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <a at unstable.cc>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index ec67def..5852fda 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -3356,8 +3356,7 @@ bool batadv_is_ap_isolated(struct batadv_priv *bat_priv, u8 *src, u8 *dst,
 	ret = true;
-	if (vlan)
-		batadv_softif_vlan_free_ref(vlan);
+	batadv_softif_vlan_free_ref(vlan);
 	if (tt_global_entry)
 	if (tt_local_entry)


More information about the linux-merge mailing list