1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-10-01 10:56:21 +03:00

mac80211: merge a LED related locking fix

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30396 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-02-09 14:24:15 +00:00
parent d038b562d6
commit 3a1a68de74

View File

@ -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,