mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
928e893a11
The removed patches were applied upstream. The type of the RT2X00_LIB_EEPROM config option was changed to bool, because boolean is an invalid value and the new kconfig system complained about this. 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
|
|
@@ -314,7 +314,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)
|
|
{
|
|
@@ -373,7 +373,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)
|
|
{
|
|
@@ -1269,14 +1269,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)
|
|
@@ -1285,13 +1285,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
|
|
rtnl_lock();
|
|
@@ -1319,10 +1319,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
|
|
|