[2/2] batman-adv: increase BLA wait periods to 6

Message ID 1447082453-13117-3-git-send-email-sw@simonwunderlich.de (mailing list archive)
State Accepted, archived
Commit c57af3a7c3dc3b3649ded771988fe4a108ec1945
Headers

Commit Message

Simon Wunderlich Nov. 9, 2015, 3:20 p.m. UTC
  From: Simon Wunderlich <simon@open-mesh.com>

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@open-mesh.com>
---
 net/batman-adv/main.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Marek Lindner Nov. 21, 2015, 9:43 p.m. UTC | #1
On Monday, November 09, 2015 16:20:53 Simon Wunderlich wrote:
> From: Simon Wunderlich <simon@open-mesh.com>
> 
> 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@open-mesh.com>
> ---
>  net/batman-adv/main.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied in revision c57af3a.

Thanks,
Marek
  

Patch

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 79e2052..dcca44b 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