batman-adv: accept delayed rebroadcasts to avoid bogus routing under heavy load

When a link is saturated (re)broadcasts of OGMs are delayed. Under heavy
load this delay may exceed the orig interval which leads to OGMs being
dropped (the code would only accept an OGM rebroadcast if it arrived
before the next OGM was broadcasted). With this patch batman-adv will
also accept delayed OGMs in order to avoid a bogus influence on the
routing metric.

Signed-off-by: Daniele Furlan <daniele.furlan@gmail.com>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 368ceeba8145db20415923da2e18cd942b73d143..934f1f2f86c6583caf658280f089ce3eb4ad3721 100644 (file)
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -698,17 +698,16 @@ void receive_bat_packet(const struct ethhdr *ethhdr,
 
                /* neighbor has to indicate direct link and it has to
                 * come via the corresponding interface */
-               /* if received seqno equals last send seqno save new
-                * seqno for bidirectional check */
+               /* save packet seqno for bidirectional check */
                if (has_directlink_flag &&
                    compare_eth(if_incoming->net_dev->dev_addr,
-                               batman_packet->orig) &&
-                   (batman_packet->seqno - if_incoming_seqno + 2 == 0)) {
+                               batman_packet->orig)) {
                        offset = if_incoming->if_num * NUM_WORDS;
 
                        spin_lock_bh(&orig_neigh_node->ogm_cnt_lock);
                        word = &(orig_neigh_node->bcast_own[offset]);
-                       bit_mark(word, 0);
+                       bit_mark(word,
+                                if_incoming_seqno - batman_packet->seqno - 2);
                        orig_neigh_node->bcast_own_sum[if_incoming->if_num] =
                                bit_packet_count(word);
                        spin_unlock_bh(&orig_neigh_node->ogm_cnt_lock);