diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-15 19:41:52 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-15 19:41:52 +0100 |
| commit | 33b5d30cd8b200024d55ac5830c9efde1102ef4c (patch) | |
| tree | 4788d50ad6994a40bda8e146db4ca9674a482b92 /net | |
| parent | 3c59x: shorten timer period for slave devices (diff) | |
| parent | rtlwifi: Modify rtl_pci_init to return 0 on success (diff) | |
| download | linux-33b5d30cd8b200024d55ac5830c9efde1102ef4c.tar.xz linux-33b5d30cd8b200024d55ac5830c9efde1102ef4c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 0a0d94ad9b08..b142bd4c2390 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -910,6 +910,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 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, @@ -931,8 +933,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 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, |