batman-adv: upgrade package to latest release 2016.5

[feed/routing.git] / batman-adv / patches / 0002-batman-adv-Revert-fix-splat-on-disabling-an-interfac.patch

diff --git a/batman-adv/patches/0002-batman-adv-Revert-fix-splat-on-disabling-an-interfac.patch b/batman-adv/patches/0002-batman-adv-Revert-fix-splat-on-disabling-an-interfac.patch
deleted file mode 100644 (file)
index 46d2779..0000000
--- a/batman-adv/patches/0002-batman-adv-Revert-fix-splat-on-disabling-an-interfac.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Wed, 2 Nov 2016 18:14:43 +0100
-Subject: [PATCH] batman-adv: Revert "fix splat on disabling an interface"
-
-The commit bac7733d06fa ("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>
----
- net/batman-adv/hard-interface.c | 1 +
- 1 file changed, 1 insertion(+)
-
-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: