The following commit has been merged in the merge/master branch: commit af3558688698479a56034f0fcbca164be2052aa8 Author: Linus Lüssing linus.luessing@c0d3.blue Date: Fri Aug 14 17:23:48 2015 +0200

batman-adv: Remove unnecessary braces for test_bit() in DAT

Fixes: de466678 ("batman-adv: Fix broken DAT capability check") Signed-off-by: Linus Lüssing linus.luessing@c0d3.blue Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 1caf7d2..63243a3 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -453,7 +453,7 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res, int j;

/* check if orig node candidate is running DAT */ - if (!(test_bit(BATADV_ORIG_CAPA_HAS_DAT, &candidate->capabilities))) + if (!test_bit(BATADV_ORIG_CAPA_HAS_DAT, &candidate->capabilities)) goto out;

/* Check if this node has already been selected... */