From: David S. Miller <davem@davemloft.net>
Date: Mon, 25 Jun 2012 23:15:58 +0000 (-0700)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1d5873e9d75bb72012a6c1327a368d0d2b13581f;p=linux-beck.git

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>
---

1d5873e9d75bb72012a6c1327a368d0d2b13581f
diff --cc net/batman-adv/translation-table.c
index 3806d9bbf55e,f7a615261f4e..cf7988342f27
--- a/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)