diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-08 20:14:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-08 20:14:32 -0800 |
| commit | fb57720daf6e56ba453414b5e8dd9cb3c0c80257 (patch) | |
| tree | c00ef9e9b447cd8b8a11c8d45a741d96e17570f2 /net/batman-adv/bitarray.h | |
| parent | f40e74ffa3de44f7ef4c09653b070dd115ab7fbe (diff) | |
| parent | 9535395640edb23ba5cec2abb026c4ee51899722 (diff) | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- remove useless return in void functions
- remove unused member 'primary_iface' from 'struct orig_node'
- improve existing kernel doc
- fix several checkpatch complaints
- ensure socket's control block is cleared for received skbs
- add missing DEBUG_FS dependency to BATMAN_ADV_DEBUG symbol
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/bitarray.h')
| -rw-r--r-- | net/batman-adv/bitarray.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index cc2407351d36..2acaafe60188 100644 --- 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 */ |