diff mbox

batman-adv: wait multiple periods before activating bla

Message ID 1347553126-13816-1-git-send-email-siwu@hrz.tu-chemnitz.de (mailing list archive)
State Accepted, archived
Commit bafd3f4f99d2b0b205a1b4cf193ee8ad151c710e
Headers

Commit Message

Simon Wunderlich Sept. 13, 2012, 4:18 p.m. UTC 
  For some reasons (bridge forward delay, network device setup order, etc)
the initial bridge loop avoidance announcement packets may be lost. This
may lead to problems in finding other backbone gws, and therfore create
loops in the startup time.

Fix this by extending the waiting periods to 3 (define can be changed)
before allowing broadcast traffic.

Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
---
 bridge_loop_avoidance.c |    9 ++++++++-
 main.h                  |    1 +
 types.h                 |    1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

Comments

Marek Lindner Sept. 23, 2012, 7:52 a.m. UTC | #1 
On Friday, September 14, 2012 00:18:46 Simon Wunderlich wrote:
> For some reasons (bridge forward delay, network device setup order, etc)
> the initial bridge loop avoidance announcement packets may be lost. This
> may lead to problems in finding other backbone gws, and therfore create
> loops in the startup time.
> 
> Fix this by extending the waiting periods to 3 (define can be changed)
> before allowing broadcast traffic.
> 
> Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
> ---
>  bridge_loop_avoidance.c |    9 ++++++++-
>  main.h                  |    1 +
>  types.h                 |    1 +
>  3 files changed, 10 insertions(+), 1 deletion(-)

Applied in revision bafd3f4.

Thanks,
Marek
diff mbox

Patch

diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c
index db046d8..93cf799 100644
--- a/bridge_loop_avoidance.c
+++ b/bridge_loop_avoidance.c
@@ -386,6 +386,7 @@  batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig,
 	entry->crc = BATADV_BLA_CRC_INIT;
 	entry->bat_priv = bat_priv;
 	atomic_set(&entry->request_sent, 0);
+	atomic_set(&entry->wait_periods, 0);
 	memcpy(entry->orig, orig, ETH_ALEN);
 
 	/* one for the hash, one for returning */
@@ -415,6 +416,7 @@  batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig,
 
 		/* this will be decreased in the worker thread */
 		atomic_inc(&entry->request_sent);
+		atomic_set(&entry->wait_periods, BATADV_BLA_WAIT_PERIODS);
 		atomic_inc(&bat_priv->bla.num_requests);
 	}
 
@@ -1156,12 +1158,17 @@  static void batadv_bla_periodic_work(struct work_struct *work)
 			 * problems when we are not yet known as backbone gw
 			 * in the backbone.
 			 *
-			 * We can reset this now and allow traffic again.
+			 * We can reset this now after we waited some periods
+			 * to give bridge forward delays and bla group forming
+			 * some grace time.
 			 */
 
 			if (atomic_read(&backbone_gw->request_sent) == 0)
 				continue;
 
+			if (!atomic_dec_and_test(&backbone_gw->wait_periods))
+				continue;
+
 			atomic_dec(&backbone_gw->bat_priv->bla.num_requests);
 			atomic_set(&backbone_gw->request_sent, 0);
 		}
diff --git a/main.h b/main.h
index e828755..b45d5ad 100644
--- a/main.h
+++ b/main.h
@@ -89,6 +89,7 @@ 
 #define BATADV_BLA_PERIOD_LENGTH	10000	/* 10 seconds */
 #define BATADV_BLA_BACKBONE_TIMEOUT	(BATADV_BLA_PERIOD_LENGTH * 3)
 #define BATADV_BLA_CLAIM_TIMEOUT	(BATADV_BLA_PERIOD_LENGTH * 10)
+#define BATADV_BLA_WAIT_PERIODS		3
 
 #define BATADV_DUPLIST_SIZE		16
 #define BATADV_DUPLIST_TIMEOUT		500	/* 500 ms */
diff --git a/types.h b/types.h
index dc126e7..b425dde 100644
--- a/types.h
+++ b/types.h
@@ -326,6 +326,7 @@  struct batadv_backbone_gw {
 	struct hlist_node hash_entry;
 	struct batadv_priv *bat_priv;
 	unsigned long lasttime;	/* last time we heard of this backbone gw */
+	atomic_t wait_periods;
 	atomic_t request_sent;
 	atomic_t refcount;
 	struct rcu_head rcu;