OSDN Git Service

batman-adv: Revert "fix splat on disabling an interface"
authorSven Eckelmann <sven@narfation.org>
Wed, 2 Nov 2016 17:14:43 +0000 (18:14 +0100)
committerSimon Wunderlich <sw@simonwunderlich.de>
Fri, 4 Nov 2016 11:27:34 +0000 (12:27 +0100)
commit27915aa61060fd8954a68a86657784705955088a
tree88d8f51cbcffedfdee671104413c8b61ba7a54a8
parent9799c50372b23ed774791bdb87d700f1286ee8a9
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>
net/batman-adv/hard-interface.c