Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
commit e344097b219b09ed1d70f4e47164bba7998cc5a6 Author: Simon Wunderlich simon.wunderlich@s2003.tu-chemnitz.de Date: Sun Sep 9 22:27:57 2012 +0200
batman-adv: allow bla traffic only after first worker period
When adding a backbone gateway for the first time, it might not yet be known in the backbone, and therefore we should not forward broadcasts yet. This behaviour is the same as when sending a request to another backbone gw because of a CRC mismatch. The backbone gw will operate normal after the next periodic bla work.
Signed-off-by: Simon Wunderlich siwu@hrz.tu-chemnitz.de
e344097b219b09ed1d70f4e47164bba7998cc5a6 bridge_loop_avoidance.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 2b74495..060ffcc 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -414,9 +414,14 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig, batadv_orig_node_free_ref(orig_node); }
- if (own_backbone) + if (own_backbone) { batadv_bla_send_announce(bat_priv, entry);
+ /* this will be decreased in the worker thread */ + atomic_inc(&entry->request_sent); + atomic_inc(&bat_priv->bla.num_requests); + } + return entry; }
@@ -1150,6 +1155,19 @@ static void batadv_bla_periodic_work(struct work_struct *work) backbone_gw->lasttime = jiffies;
batadv_bla_send_announce(bat_priv, backbone_gw); + + /* request_sent is only set after creation to avoid + * problems when we are not yet known as backbone gw + * in the backbone. + * + * We can reset this now and allow traffic again. + */ + + if (atomic_read(&backbone_gw->request_sent) == 0) + continue; + + atomic_dec(&backbone_gw->bat_priv->bla.num_requests); + atomic_set(&backbone_gw->request_sent, 0); } rcu_read_unlock(); }