diff options
| author | Marek Lindner | 2011-04-21 15:52:17 +0200 |
|---|---|---|
| committer | Sven Eckelmann | 2011-05-08 16:10:41 +0200 |
| commit | 61906ae86d8989e5bd3bc1f51b2fb8d32ffde2c5 (patch) | |
| tree | df71d837c147495099a1411897652154bc26c08e /net/batman-adv/main.c | |
| parent | batman-adv: remove misplaced comment (diff) | |
| download | kernel-qcow2-linux-61906ae86d8989e5bd3bc1f51b2fb8d32ffde2c5.tar.gz kernel-qcow2-linux-61906ae86d8989e5bd3bc1f51b2fb8d32ffde2c5.tar.xz kernel-qcow2-linux-61906ae86d8989e5bd3bc1f51b2fb8d32ffde2c5.zip | |
batman-adv: multi vlan support for bridge loop detection
The bridge loop detection for batman-adv allows the bat0 interface
to be bridged into an ethernet segment which other batman-adv nodes
are connected to. In order to also allow multiple VLANs on top of
the bat0 interface to be bridged into the ethernet segment this
patch extends the aforementioned bridge loop detection.
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/main.c')
| -rw-r--r-- | net/batman-adv/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 709b33bbdf43..705e8be07c8d 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -87,11 +87,12 @@ int mesh_init(struct net_device *soft_iface) spin_lock_init(&bat_priv->vis_hash_lock); spin_lock_init(&bat_priv->vis_list_lock); spin_lock_init(&bat_priv->softif_neigh_lock); + spin_lock_init(&bat_priv->softif_neigh_vid_lock); INIT_HLIST_HEAD(&bat_priv->forw_bat_list); INIT_HLIST_HEAD(&bat_priv->forw_bcast_list); INIT_HLIST_HEAD(&bat_priv->gw_list); - INIT_HLIST_HEAD(&bat_priv->softif_neigh_list); + INIT_HLIST_HEAD(&bat_priv->softif_neigh_vids); if (originator_init(bat_priv) < 1) goto err; |