[linux-next] LinuxNextTracking branch, master, updated. next-20110624

batman at open-mesh.org batman at open-mesh.org
Fri Jun 24 16:09:47 CEST 2011


The following commit has been merged in the master branch:
commit d1829fa0c380ccf48a7b96795a6d4a01698d02a6
Author: Daniele Furlan <daniele.furlan at gmail.com>
Date:   Tue Jun 7 00:45:55 2011 +0200

    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 at gmail.com>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 368ceeb..934f1f2 100644
--- 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);

-- 
LinuxNextTracking


More information about the linux-merge mailing list