batman-adv: add per VLAN interface attribute framework

Since batman-adv is now fully VLAN-aware, a proper framework
able to handle per-vlan-interface attributes is needed.

Those attributes will affect the associated VLAN interface
only, rather than the real soft_iface (which would result
in every vlan interface having the same attribute
configuration).

To make the code simpler and easier to extend, attributes
associated to the standalone soft_iface are now treated
like belonging to yet another vlan having a special vid.
This vid is different from the others because it is made up
by all zeros and the VLAN_HAS_TAG bit is not set.

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>

1 files changed, 2 insertions, 3 deletions

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 80f60d1144f0..22075511c448 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -113,6 +113,7 @@ int batadv_mesh_init(struct net_device *soft_iface)
         spin_lock_init(&bat_priv->gw.list_lock);
         spin_lock_init(&bat_priv->tvlv.container_list_lock);
         spin_lock_init(&bat_priv->tvlv.handler_list_lock);
+        spin_lock_init(&bat_priv->softif_vlan_list_lock);
 
         INIT_HLIST_HEAD(&bat_priv->forw_bat_list);
         INIT_HLIST_HEAD(&bat_priv->forw_bcast_list);
@@ -122,6 +123,7 @@ int batadv_mesh_init(struct net_device *soft_iface)
         INIT_LIST_HEAD(&bat_priv->tt.roam_list);
         INIT_HLIST_HEAD(&bat_priv->tvlv.container_list);
         INIT_HLIST_HEAD(&bat_priv->tvlv.handler_list);
+        INIT_HLIST_HEAD(&bat_priv->softif_vlan_list);
 
         ret = batadv_originator_init(bat_priv);
         if (ret < 0)
@@ -131,9 +133,6 @@ int batadv_mesh_init(struct net_device *soft_iface)
         if (ret < 0)
                 goto err;
 
-        batadv_tt_local_add(soft_iface, soft_iface->dev_addr,
-                            BATADV_NO_FLAGS, BATADV_NULL_IFINDEX);
-
         ret = batadv_bla_init(bat_priv);
         if (ret < 0)
                 goto err;