Merge tag 'arm-soc/for-3.20/dts' of http://github.com/broadcom/stblinux into fixes

[firefly-linux-kernel-4.4.55.git] / net / batman-adv / bitarray.h

diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h
index cc2407351d367f74fe9f288fdff79fe8db95f7c3..2acaafe60188711ad5f2d704b99c00435b0ee40b 100644 (file)
--- a/net/batman-adv/bitarray.h
+++ b/net/batman-adv/bitarray.h
@@ -29,8 +29,7 @@ static inline int batadv_test_bit(const unsigned long *seq_bits,
        diff = last_seqno - curr_seqno;
        if (diff < 0 || diff >= BATADV_TQ_LOCAL_WINDOW_SIZE)
                return 0;
-       else
-               return test_bit(diff, seq_bits) != 0;
+       return test_bit(diff, seq_bits) != 0;
 }
 
 /* turn corresponding bit on, so we can remember that we got the packet */