diff options
author | David S. Miller <davem@davemloft.net> | 2012-02-28 15:07:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-28 15:07:52 -0500 |
commit | 0695512a57a8ad5c0495b2a3b23b3216434e3f92 (patch) | |
tree | dcf2cfb60274bcb9428d9ca054bb916f388ba2dc /net/batman-adv/bitarray.c | |
parent | 5bd49735db39c1c1360cb91b1f1e1c999d90eb94 (diff) | |
parent | 7c64fd98ce512de6c6dae0452dc026446bd368d5 (diff) |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/batman-adv/bitarray.c')
-rw-r--r-- | net/batman-adv/bitarray.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c index 9bc63b209b3..6d0aa216b23 100644 --- a/net/batman-adv/bitarray.c +++ b/net/batman-adv/bitarray.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * @@ -154,8 +154,8 @@ int bit_get_packet(void *priv, unsigned long *seq_bits, /* sequence number is much newer, probably missed a lot of packets */ - if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) - && (seq_num_diff < EXPECTED_SEQNO_RANGE)) { + if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) && + (seq_num_diff < EXPECTED_SEQNO_RANGE)) { bat_dbg(DBG_BATMAN, bat_priv, "We missed a lot of packets (%i) !\n", seq_num_diff - 1); @@ -170,8 +170,8 @@ int bit_get_packet(void *priv, unsigned long *seq_bits, * packet should be dropped without calling this function if the * seqno window is protected. */ - if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) - || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { + if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) || + (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { bat_dbg(DBG_BATMAN, bat_priv, "Other host probably restarted!\n"); |