Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 420cb1b7 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by David S. Miller
Browse files

batman-adv: Clean up untagged vlan when destroying via rtnl-link 



The untagged vlan object is only destroyed when the interface is removed
via the legacy sysfs interface. But it also has to be destroyed when the
standard rtnl-link interface is used.

Fixes: 5d2c05b2 ("batman-adv: add per VLAN interface attribute framework")
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Acked-by: default avatarAntonio Quartulli <a@unstable.cc>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b55e442

net/batman-adv/soft-interface.c

+9 −0
Original line number Diff line number Diff line
@@ -1033,7 +1033,9 @@ void batadv_softif_destroy_sysfs(struct net_device *soft_iface) 
static void batadv_softif_destroy_netlink(struct net_device *soft_iface,

					  struct list_head *head)

{

	struct batadv_priv *bat_priv = netdev_priv(soft_iface);

	struct batadv_hard_iface *hard_iface;

	struct batadv_softif_vlan *vlan;



	list_for_each_entry(hard_iface, &batadv_hardif_list, list) {

		if (hard_iface->soft_iface == soft_iface)
@@ -1041,6 +1043,13 @@ static void batadv_softif_destroy_netlink(struct net_device *soft_iface, 
							BATADV_IF_CLEANUP_KEEP);

	}



	/* destroy the "untagged" VLAN */

	vlan = batadv_softif_vlan_get(bat_priv, BATADV_NO_FLAGS);

	if (vlan) {

		batadv_softif_destroy_vlan(bat_priv, vlan);

		batadv_softif_vlan_put(vlan);

	}



	batadv_sysfs_del_meshif(soft_iface);

	unregister_netdevice_queue(soft_iface, head);

}