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

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

Fixes: dfb27e75 ("batman-adv: Fix broken NC 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/network-coding.c b/net/batman-adv/network-coding.c index 55a0b28..1a1f7e6 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -894,7 +894,7 @@ void batadv_nc_update_nc_node(struct batadv_priv *bat_priv, goto out;

/* check if orig node is network coding enabled */ - if (!(test_bit(BATADV_ORIG_CAPA_HAS_NC, &orig_node->capabilities))) + if (!test_bit(BATADV_ORIG_CAPA_HAS_NC, &orig_node->capabilities)) goto out;

/* accept ogms from 'good' neighbors and single hop neighbors */