[11/16] batman-adv: Split a condition check

Message ID 1452345621-15908-12-git-send-email-a@unstable.cc (mailing list archive)
State Not Applicable, archived

Commit Message

Antonio Quartulli Jan. 9, 2016, 1:20 p.m. UTC
  From: Markus Elfring <elfring@users.sourceforge.net>

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@users.sourceforge.net>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
 net/batman-adv/translation-table.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 5852fda9f175..a22080c53401 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);