mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 18:19:02 +00:00
a8f63a0717
This updates mac80211 to backprots-4.14-rc2. This was compile and runtime tested with ath9k, ath10k and b43 with multiple stations and ieee80211w and in different scenarios by many other people. To create the backports-4.14-rc2-1.tar.xz use this repository: https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git from tag v4.14-rc2-1 Then run this: ./gentree.py --git-revision v4.14-rc2 --clean <path to linux repo> ../backports-4.14-rc2-1 This also adapts the ath10k-ct and mt76 driver to the changed cfg80211 APIs and syncs the nl80211.h file in iw with the new version from backports-4.14-rc2. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
68 lines
1.9 KiB
Diff
68 lines
1.9 KiB
Diff
--- a/net/mac80211/main.c
|
|
+++ b/net/mac80211/main.c
|
|
@@ -292,7 +292,7 @@ void ieee80211_restart_hw(struct ieee802
|
|
}
|
|
EXPORT_SYMBOL(ieee80211_restart_hw);
|
|
|
|
-#ifdef CONFIG_INET
|
|
+#ifdef __disabled__CONFIG_INET
|
|
static int ieee80211_ifa_changed(struct notifier_block *nb,
|
|
unsigned long data, void *arg)
|
|
{
|
|
@@ -351,7 +351,7 @@ static int ieee80211_ifa_changed(struct
|
|
}
|
|
#endif
|
|
|
|
-#if IS_ENABLED(CONFIG_IPV6)
|
|
+#if IS_ENABLED(__disabled__CONFIG_IPV6)
|
|
static int ieee80211_ifa6_changed(struct notifier_block *nb,
|
|
unsigned long data, void *arg)
|
|
{
|
|
@@ -1115,14 +1115,14 @@ int ieee80211_register_hw(struct ieee802
|
|
if (result)
|
|
goto fail_flows;
|
|
|
|
-#ifdef CONFIG_INET
|
|
+#ifdef __disabled__CONFIG_INET
|
|
local->ifa_notifier.notifier_call = ieee80211_ifa_changed;
|
|
result = register_inetaddr_notifier(&local->ifa_notifier);
|
|
if (result)
|
|
goto fail_ifa;
|
|
#endif
|
|
|
|
-#if IS_ENABLED(CONFIG_IPV6)
|
|
+#if IS_ENABLED(__disabled__CONFIG_IPV6)
|
|
local->ifa6_notifier.notifier_call = ieee80211_ifa6_changed;
|
|
result = register_inet6addr_notifier(&local->ifa6_notifier);
|
|
if (result)
|
|
@@ -1131,13 +1131,13 @@ int ieee80211_register_hw(struct ieee802
|
|
|
|
return 0;
|
|
|
|
-#if IS_ENABLED(CONFIG_IPV6)
|
|
+#if IS_ENABLED(__disabled__CONFIG_IPV6)
|
|
fail_ifa6:
|
|
-#ifdef CONFIG_INET
|
|
+#ifdef __disabled__CONFIG_INET
|
|
unregister_inetaddr_notifier(&local->ifa_notifier);
|
|
#endif
|
|
#endif
|
|
-#if defined(CONFIG_INET) || defined(CONFIG_IPV6)
|
|
+#if defined(__disabled__CONFIG_INET) || defined(__disabled__CONFIG_IPV6)
|
|
fail_ifa:
|
|
#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);
|
|
|
|
-#ifdef CONFIG_INET
|
|
+#ifdef __disabled__CONFIG_INET
|
|
unregister_inetaddr_notifier(&local->ifa_notifier);
|
|
#endif
|
|
-#if IS_ENABLED(CONFIG_IPV6)
|
|
+#if IS_ENABLED(__disabled__CONFIG_IPV6)
|
|
unregister_inet6addr_notifier(&local->ifa6_notifier);
|
|
#endif
|
|
|