Merge tag 'nfs-for-4.13-2' of git://git.linux-nfs.org/projects/anna/linux-nfs

[karo-tx-linux.git] / net / batman-adv / translation-table.c

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index e75b4937b497401284bc553182737a2f7af54605..e1133bc634b5e8ed9a4639677e577a0d52e7c1d5 100644 (file)
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -2488,18 +2488,16 @@ static bool
 _batadv_is_ap_isolated(struct batadv_tt_local_entry *tt_local_entry,
                       struct batadv_tt_global_entry *tt_global_entry)
 {
-       bool ret = false;
-
        if (tt_local_entry->common.flags & BATADV_TT_CLIENT_WIFI &&
            tt_global_entry->common.flags & BATADV_TT_CLIENT_WIFI)
-               ret = true;
+               return true;
 
        /* check if the two clients are marked as isolated */
        if (tt_local_entry->common.flags & BATADV_TT_CLIENT_ISOLA &&
            tt_global_entry->common.flags & BATADV_TT_CLIENT_ISOLA)
-               ret = true;
+               return true;
 
-       return ret;
+       return false;
 }
 
 /**
@@ -4010,19 +4008,22 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv,
                                          const unsigned char *addr,
                                          unsigned short vid)
 {
-       bool ret = false;
+       /* ignore loop detect macs, they are not supposed to be in the tt local
+        * data as well.
+        */
+       if (batadv_bla_is_loopdetect_mac(addr))
+               return false;
 
        if (!batadv_tt_global_add(bat_priv, orig_node, addr, vid,
                                  BATADV_TT_CLIENT_TEMP,
                                  atomic_read(&orig_node->last_ttvn)))
-               goto out;
+               return false;
 
        batadv_dbg(BATADV_DBG_TT, bat_priv,
                   "Added temporary global client (addr: %pM, vid: %d, orig: %pM)\n",
                   addr, batadv_print_vid(vid), orig_node->orig);
-       ret = true;
-out:
-       return ret;
+
+       return true;
 }
 
 /**