summaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-06-26 19:00:01 +0200
committerFelix Fietkau <nbd@nbd.name>2016-07-02 19:34:50 +0200
commit67a7daa938671a5c7006e5d689c297a26499d75c (patch)
treec11db1b831745bcc356f105f421cefbba938cb41 /package/kernel/mac80211/patches/150-disable_addr_notifier.patch
parentde165b66be47497906d3cf4f1ca6071ee25e2003 (diff)
downloadmaster-31e0f0ae-67a7daa938671a5c7006e5d689c297a26499d75c.tar.gz
master-31e0f0ae-67a7daa938671a5c7006e5d689c297a26499d75c.tar.bz2
master-31e0f0ae-67a7daa938671a5c7006e5d689c297a26499d75c.zip
mac80211: update to wireless-testing 2016-06-20
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/150-disable_addr_notifier.patch')
-rw-r--r--package/kernel/mac80211/patches/150-disable_addr_notifier.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
index 3029598437..16fab84535 100644
--- a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
+++ b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
@@ -18,9 +18,9 @@
static int ieee80211_ifa6_changed(struct notifier_block *nb,
unsigned long data, void *arg)
{
-@@ -1089,14 +1089,14 @@ int ieee80211_register_hw(struct ieee802
-
- rtnl_unlock();
+@@ -1090,14 +1090,14 @@ int ieee80211_register_hw(struct ieee802
+ if (result)
+ goto fail_flows;
-#ifdef CONFIG_INET
+#ifdef __disabled__CONFIG_INET
@@ -35,7 +35,7 @@
local->ifa6_notifier.notifier_call = ieee80211_ifa6_changed;
result = register_inet6addr_notifier(&local->ifa6_notifier);
if (result)
-@@ -1105,13 +1105,13 @@ int ieee80211_register_hw(struct ieee802
+@@ -1106,13 +1106,13 @@ int ieee80211_register_hw(struct ieee802
return 0;
@@ -51,8 +51,8 @@
+#if defined(__disabled__CONFIG_INET) || defined(__disabled__CONFIG_IPV6)
fail_ifa:
#endif
- rtnl_lock();
-@@ -1139,10 +1139,10 @@ void ieee80211_unregister_hw(struct ieee
+ ieee80211_txq_teardown_flows(local);
+@@ -1142,10 +1142,10 @@ void ieee80211_unregister_hw(struct ieee
tasklet_kill(&local->tx_pending_tasklet);
tasklet_kill(&local->tasklet);