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

batman at open-mesh.org batman at open-mesh.org
Tue Jan 12 00:15:45 CET 2016


The following commit has been merged in the master branch:
commit e1544f3c87778ab4af9689d571570d6abfd2f6c2
Author: Simon Wunderlich <simon at open-mesh.com>
Date:   Mon Nov 9 16:20:53 2015 +0100

    batman-adv: increase BLA wait periods to 6
    
    If networks take a long time to come up, e.g. due to lossy links, then
    the bridge loop avoidance wait time to suppress broadcasts may not wait
    long enough and detect a backbone before the mesh is brought up.
    Increasing the wait period further to 60 seconds makes this scenario
    less likely.
    
    Signed-off-by: Simon Wunderlich <simon at open-mesh.com>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <a at unstable.cc>

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index da9f16c..9dbd910 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -109,7 +109,7 @@
 #define BATADV_MAX_AGGREGATION_MS 100
 
 #define BATADV_BLA_PERIOD_LENGTH	10000	/* 10 seconds */
-#define BATADV_BLA_BACKBONE_TIMEOUT	(BATADV_BLA_PERIOD_LENGTH * 3)
+#define BATADV_BLA_BACKBONE_TIMEOUT	(BATADV_BLA_PERIOD_LENGTH * 6)
 #define BATADV_BLA_CLAIM_TIMEOUT	(BATADV_BLA_PERIOD_LENGTH * 10)
 #define BATADV_BLA_WAIT_PERIODS		3
 

-- 
LinuxNextTracking


More information about the linux-merge mailing list