Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[deliverable/linux.git] / net / batman-adv / main.c

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index bf8a01b8f0266833332d797370bf6302c0aadb48..d64ddb961979ae083ba99907b07fc090a3dfe775 100644 (file)
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -87,6 +87,7 @@ static int __init batadv_init(void)
 
        batadv_recv_handler_init();
 
+       batadv_v_init();
        batadv_iv_init();
        batadv_nc_init();
 
@@ -159,6 +160,10 @@ int batadv_mesh_init(struct net_device *soft_iface)
        INIT_HLIST_HEAD(&bat_priv->tvlv.handler_list);
        INIT_HLIST_HEAD(&bat_priv->softif_vlan_list);
 
+       ret = batadv_v_mesh_init(bat_priv);
+       if (ret < 0)
+               goto err;
+
        ret = batadv_originator_init(bat_priv);
        if (ret < 0)
                goto err;
@@ -201,6 +206,8 @@ void batadv_mesh_free(struct net_device *soft_iface)
        batadv_purge_outstanding_packets(bat_priv, NULL);
 
        batadv_gw_node_free(bat_priv);
+
+       batadv_v_mesh_free(bat_priv);
        batadv_nc_mesh_free(bat_priv);
        batadv_dat_free(bat_priv);
        batadv_bla_free(bat_priv);
@@ -1261,7 +1268,7 @@ bool batadv_vlan_ap_isola_get(struct batadv_priv *bat_priv, unsigned short vid)
        vlan = batadv_softif_vlan_get(bat_priv, vid);
        if (vlan) {
                ap_isolation_enabled = atomic_read(&vlan->ap_isolation);
-               batadv_softif_vlan_free_ref(vlan);
+               batadv_softif_vlan_put(vlan);
        }
 
        return ap_isolation_enabled;