diff options
| author | Sven Eckelmann <sven@narfation.org> | 2020-08-17 14:37:13 +0200 |
|---|---|---|
| committer | Simon Wunderlich <sw@simonwunderlich.de> | 2020-12-04 08:40:52 +0100 |
| commit | a962cb29bb608acdbf88a64368159d099671380e (patch) | |
| tree | b2c16d71accd72293d7dd49bbb04e9e25fef783b /net/batman-adv/soft-interface.c | |
| parent | aff6f5a68b921aa8d49c9a50e0115a5b099732ef (diff) | |
| download | linux-stable-a962cb29bb608acdbf88a64368159d099671380e.tar.gz linux-stable-a962cb29bb608acdbf88a64368159d099671380e.tar.bz2 linux-stable-a962cb29bb608acdbf88a64368159d099671380e.zip | |
batman-adv: Drop legacy code for auto deleting mesh interfaces
The only way to automatically drop batadv mesh interfaces when all soft
interfaces were removed was dropped with the sysfs support. It is no longer
needed to have them handled by kernel anymore.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Diffstat (limited to 'net/batman-adv/soft-interface.c')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 6c6a8c6bab17..97118efbe678 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -881,7 +881,7 @@ static int batadv_softif_slave_del(struct net_device *dev, if (!hard_iface || hard_iface->soft_iface != dev) goto out; - batadv_hardif_disable_interface(hard_iface, BATADV_IF_CLEANUP_KEEP); + batadv_hardif_disable_interface(hard_iface); ret = 0; out: @@ -1139,8 +1139,7 @@ static void batadv_softif_destroy_netlink(struct net_device *soft_iface, list_for_each_entry(hard_iface, &batadv_hardif_list, list) { if (hard_iface->soft_iface == soft_iface) - batadv_hardif_disable_interface(hard_iface, - BATADV_IF_CLEANUP_KEEP); + batadv_hardif_disable_interface(hard_iface); } /* destroy the "untagged" VLAN */ |