[linux-next] LinuxNextTracking branch, master, updated. next-20160824

batman at open-mesh.org batman at open-mesh.org
Thu Aug 25 00:15:45 CEST 2016

The following commit has been merged in the master branch:
commit 06d640c9aad6d96713ea2fbe36f5a344428ccd57
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Jul 10 15:47:57 2016 +0200

    batman-adv: Keep batadv netdev when hardif disappears
    Switch-like virtual interfaces like bridge or openvswitch don't destroy
    itself when all their attached netdevices dissappear. Instead they only
    remove the link to the unregistered device and keep working until they get
    removed manually.
    This has the benefit that all configurations for this interfaces are kept
    and daemons reacting to rtnl events can just add new slave interfaces
    without going through the complete configuration of the switch-like
    Handling unregister events of client devices similar in batman-adv allows
    users to drop their current workaround of dummy netdevices attached to
    batman-adv soft-interfaces.
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 9284c73..08ce361 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -725,7 +725,7 @@ static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface)
 	/* first deactivate interface */
 	if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)
 	if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)


More information about the linux-merge mailing list