mac80211: update to backports-4.14-rc2

[openwrt/staging/lynxis.git] / package / kernel / mac80211 / patches / 150-disable_addr_notifier.patch

diff --git a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
index 3a0078608d0fb7f9c2a5070a050ffb8813950bab..42a692a1fcd85f0620eda76719bc8b5a09179365 100644 (file)
--- a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
+++ b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
@@ -1,6 +1,6 @@
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
-@@ -291,7 +291,7 @@ void ieee80211_restart_hw(struct ieee802
+@@ -292,7 +292,7 @@ void ieee80211_restart_hw(struct ieee802
  }
  EXPORT_SYMBOL(ieee80211_restart_hw);
  
@@ -9,7 +9,7 @@
  static int ieee80211_ifa_changed(struct notifier_block *nb,
                                 unsigned long data, void *arg)
  {
-@@ -350,7 +350,7 @@ static int ieee80211_ifa_changed(struct 
+@@ -351,7 +351,7 @@ static int ieee80211_ifa_changed(struct
  }
  #endif
  
@@ -18,9 +18,9 @@
  static int ieee80211_ifa6_changed(struct notifier_block *nb,
                                  unsigned long data, void *arg)
  {
-@@ -978,14 +978,14 @@ int ieee80211_register_hw(struct ieee802
-               goto fail_pm_qos;
-       }
+@@ -1115,14 +1115,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)
-@@ -994,13 +994,13 @@ int ieee80211_register_hw(struct ieee802
+@@ -1131,13 +1131,13 @@ int ieee80211_register_hw(struct ieee802
  
        return 0;
  
@@ -50,12 +50,12 @@
 -#if defined(CONFIG_INET) || defined(CONFIG_IPV6)
 +#if defined(__disabled__CONFIG_INET) || defined(__disabled__CONFIG_IPV6)
   fail_ifa:
-       pm_qos_remove_notifier(PM_QOS_NETWORK_LATENCY,
-                              &local->network_latency_notifier);
-@@ -1033,10 +1033,10 @@ void ieee80211_unregister_hw(struct ieee
+ #endif
+       ieee80211_txq_teardown_flows(local);
+@@ -1167,10 +1167,10 @@ void ieee80211_unregister_hw(struct ieee
+       tasklet_kill(&local->tx_pending_tasklet);
+       tasklet_kill(&local->tasklet);
  
-       pm_qos_remove_notifier(PM_QOS_NETWORK_LATENCY,
-                              &local->network_latency_notifier);
 -#ifdef CONFIG_INET
 +#ifdef __disabled__CONFIG_INET
        unregister_inetaddr_notifier(&local->ifa_notifier);