diff options
| author |   Sven Eckelmann <sven@narfation.org> | 2016-11-02 18:14:43 +0100 |
|---|---|---|
| committer |   Simon Wunderlich <sw@simonwunderlich.de> | 2016-11-04 12:27:34 +0100 |
| commit | 27915aa61060fd8954a68a86657784705955088a (patch) | |
| tree | 88d8f51cbcffedfdee671104413c8b61ba7a54a8 /net/batman-adv | |
| parent | batman-adv: fix splat on disabling an interface (diff) | |
| download | linux-dev-27915aa61060fd8954a68a86657784705955088a.tar.xz linux-dev-27915aa61060fd8954a68a86657784705955088a.zip | |
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@freifunk-rtk.de>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Acked-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/hard-interface.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index e034afbd1bb0..08ce36147c4c 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: |