Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:
- yet another batch of 'namespace cleaning' patches

Conflicts:
	net/batman-adv/translation-table.c

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc net/batman-adv/translation-table.c
index 3806d9b,f7a6152..cf79883
--- 1/net/batman-adv/translation-table.c
--- 2/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@@ -2148,12 -2176,12 +2174,12 @@@ bool batadv_is_ap_isolated(struct bat_p
  {
        struct tt_local_entry *tt_local_entry = NULL;
        struct tt_global_entry *tt_global_entry = NULL;
 -      bool ret = true;
 +      bool ret = false;
  
        if (!atomic_read(&bat_priv->ap_isolation))
 -              return false;
 +              goto out;
  
-       tt_local_entry = tt_local_hash_find(bat_priv, dst);
+       tt_local_entry = batadv_tt_local_hash_find(bat_priv, dst);
        if (!tt_local_entry)
                goto out;
  
@@@ -2161,10 -2189,10 +2187,10 @@@
        if (!tt_global_entry)
                goto out;
  
-       if (!_is_ap_isolated(tt_local_entry, tt_global_entry))
+       if (_batadv_is_ap_isolated(tt_local_entry, tt_global_entry))
                goto out;
  
 -      ret = false;
 +      ret = true;
  
  out:
        if (tt_global_entry)