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

batman at open-mesh.org batman at open-mesh.org
Wed Nov 23 00:15:58 CET 2016


The following commit has been merged in the master branch:
commit 27915aa61060fd8954a68a86657784705955088a
Author: Sven Eckelmann <sven at narfation.org>
Date:   Wed Nov 2 18:14:43 2016 +0100

    batman-adv: Revert "fix splat on disabling an interface"
    
    The commit 9799c50372b2 ("batman-adv: fix splat on disabling an interface")
    fixed a warning but at the same time broke the rtnl function add_slave for
    devices which were temporarily removed.
    
    batadv_softif_slave_add requires soft_iface of and hard_iface to be NULL
    before it is allowed to be enslaved. But this resetting of soft_iface to
    NULL in batadv_hardif_disable_interface was removed with the aforementioned
    commit.
    
    Reported-by: Julian Labus <julian at freifunk-rtk.de>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Acked-by: Linus L├╝ssing <linus.luessing at c0d3.blue>
    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 e034afb..08ce361 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -652,6 +652,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
 			batadv_softif_destroy_sysfs(hard_iface->soft_iface);
 	}
 
+	hard_iface->soft_iface = NULL;
 	batadv_hardif_put(hard_iface);
 
 out:

-- 
LinuxNextTracking


More information about the linux-merge mailing list