diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-02-09 14:24:15 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-02-09 14:24:15 +0000 |
| commit | c4e1f452a4453ff54264037c9d79f2feb78ab66b (patch) | |
| tree | 6d4682c68dd3cbe3ce3a01c66bfae6f669202f38 | |
| parent | 31a0451cee20c2aa994f3521de0942bf9bf7ddaa (diff) | |
| download | upstream-c4e1f452a4453ff54264037c9d79f2feb78ab66b.tar.gz upstream-c4e1f452a4453ff54264037c9d79f2feb78ab66b.tar.bz2 upstream-c4e1f452a4453ff54264037c9d79f2feb78ab66b.zip | |
mac80211: merge a LED related locking fix
SVN-Revision: 30396
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 20 |
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, |