The following commit has been merged in the master branch: commit 1f129fefd35842bcd450db02b6c63f958384b1b3 Author: Antonio Quartulli ordex@autistici.org Date: Mon Jun 25 20:49:50 2012 +0000

batman-adv: fix condition in AP isolation

During the last conflict resolution involving translation-table.c something went wrong and a condition in the AP isolation code was reversed. This patch fixes this problem.

Signed-off-by: Antonio Quartulli ordex@autistici.org Signed-off-by: David S. Miller davem@davemloft.net

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index cf79883..e4f27a8 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -2187,7 +2187,7 @@ bool batadv_is_ap_isolated(struct bat_priv *bat_priv, uint8_t *src, if (!tt_global_entry) goto out;

- if (_batadv_is_ap_isolated(tt_local_entry, tt_global_entry)) + if (!_batadv_is_ap_isolated(tt_local_entry, tt_global_entry)) goto out;

ret = true;