mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 18:47:06 +00:00
ed2015c386
The following patches: * 972-ath10k_fix-crash-due-to-wrong-handling-of-peer_bw_rxnss_override-parameter.patch * 973-ath10k_fix-band_center_freq-handling-for-VHT160-in-recent-firmwares.patch are replaced by this commit in the upstream kernel: * 3db24065c2c8 ("ath10k: enable VHT160 and VHT80+80 modes") The following patches were applied upstream: * 001-rt2800-enable-MFP-support-unconditionally.patch * 090-wireless-Use-linux-stddef.h-instead-of-stddef.h.patch The rtw88 driver is now split into multiple kernel modules, just put it all into one OpenWrt kernel package. rtl8812au-ct was patched to compile against the mac80211 from kernel 5.8, but not runtime tested. Add a patch which fixes ath10k on IPQ40XX, this patch was send upstream and fixes a crash when loading ath10k on this SoC. Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> [ipq40xx/ map-ac2200] 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
|
|
@@ -321,7 +321,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)
|
|
{
|
|
@@ -380,7 +380,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)
|
|
{
|
|
@@ -1301,14 +1301,14 @@ int ieee80211_register_hw(struct ieee802
|
|
|
|
rtnl_unlock();
|
|
|
|
-#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)
|
|
@@ -1317,13 +1317,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
|
|
wiphy_unregister(local->hw.wiphy);
|
|
@@ -1351,10 +1351,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
|
|
|