aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-02-09 14:24:15 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-02-09 14:24:15 +0000
commitf27c9bc6bbad778c478f68938f26c29157adedf2 (patch)
treeccf8c7e1220bc7a7a3e93ab1f9719e74f3f8768d
parentc3e541bb71d6b92b38cd460a8e8d732f51b397d7 (diff)
downloadupstream-f27c9bc6bbad778c478f68938f26c29157adedf2.tar.gz
upstream-f27c9bc6bbad778c478f68938f26c29157adedf2.tar.bz2
upstream-f27c9bc6bbad778c478f68938f26c29157adedf2.zip
mac80211: merge a LED related locking fix
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30396 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/300-pending_work.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index b8cd51a09d..d401b54bbd 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -264,3 +264,23 @@
return;
ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb);
+--- a/net/mac80211/main.c
++++ b/net/mac80211/main.c
+@@ -915,6 +915,8 @@ int ieee80211_register_hw(struct ieee802
+ wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n",
+ result);
+
++ ieee80211_led_init(local);
++
+ rtnl_lock();
+
+ result = ieee80211_init_rate_ctrl_alg(local,
+@@ -936,8 +938,6 @@ int ieee80211_register_hw(struct ieee802
+
+ rtnl_unlock();
+
+- ieee80211_led_init(local);
+-
+ local->network_latency_notifier.notifier_call =
+ ieee80211_max_network_latency;
+ result = pm_qos_add_notifier(PM_QOS_NETWORK_LATENCY,