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

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

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

    batman-adv: Split a condition check
    Let us split a check for a condition at the beginning of the
    batadv_is_ap_isolated() function so that a direct return can be performed
    in this function if the variable "vlan" contained a null pointer.
    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 5852fda..a22080c 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -3339,7 +3339,10 @@ bool batadv_is_ap_isolated(struct batadv_priv *bat_priv, u8 *src, u8 *dst,
 	bool ret = false;
 	vlan = batadv_softif_vlan_get(bat_priv, vid);
-	if (!vlan || !atomic_read(&vlan->ap_isolation))
+	if (!vlan)
+		return false;
+	if (!atomic_read(&vlan->ap_isolation))
 		goto out;
 	tt_local_entry = batadv_tt_local_hash_find(bat_priv, dst, vid);


More information about the linux-merge mailing list