diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-07-12 08:19:04 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-12 08:19:04 +0000 |
commit | d1af787dc992741bffa1a1ce0b4ca7eacb1f7227 (patch) | |
tree | b4d150683b180b04da569f049a53d592956d705b /package/mac80211/patches/150-disable_addr_notifier.patch | |
parent | 700de21fec69cc8b11374be00d04660ffbd48943 (diff) | |
download | upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.tar.gz upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.tar.bz2 upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.zip |
mac80211: backport latest version from trunk (as of r37265)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37266 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/150-disable_addr_notifier.patch')
-rw-r--r-- | package/mac80211/patches/150-disable_addr_notifier.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/mac80211/patches/150-disable_addr_notifier.patch b/package/mac80211/patches/150-disable_addr_notifier.patch index 9714696ecc..92c1909981 100644 --- a/package/mac80211/patches/150-disable_addr_notifier.patch +++ b/package/mac80211/patches/150-disable_addr_notifier.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -313,7 +313,7 @@ void ieee80211_restart_hw(struct ieee802 +@@ -300,7 +300,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) { -@@ -372,7 +372,7 @@ static int ieee80211_ifa_changed(struct +@@ -359,7 +359,7 @@ static int ieee80211_ifa_changed(struct } #endif @@ -18,7 +18,7 @@ static int ieee80211_ifa6_changed(struct notifier_block *nb, unsigned long data, void *arg) { -@@ -1015,14 +1015,14 @@ int ieee80211_register_hw(struct ieee802 +@@ -990,14 +990,14 @@ int ieee80211_register_hw(struct ieee802 goto fail_pm_qos; } @@ -35,7 +35,7 @@ local->ifa6_notifier.notifier_call = ieee80211_ifa6_changed; result = register_inet6addr_notifier(&local->ifa6_notifier); if (result) -@@ -1034,13 +1034,13 @@ int ieee80211_register_hw(struct ieee802 +@@ -1006,13 +1006,13 @@ int ieee80211_register_hw(struct ieee802 return 0; @@ -52,7 +52,7 @@ fail_ifa: pm_qos_remove_notifier(PM_QOS_NETWORK_LATENCY, &local->network_latency_notifier); -@@ -1073,10 +1073,10 @@ void ieee80211_unregister_hw(struct ieee +@@ -1045,10 +1045,10 @@ void ieee80211_unregister_hw(struct ieee pm_qos_remove_notifier(PM_QOS_NETWORK_LATENCY, &local->network_latency_notifier); |