diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 17:59:05 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 17:59:11 (GMT) |
commit | a0008bf73c12212769b0d0b19cdec5c432de94ba (patch) | |
tree | e53c67efd4aad97ab9f2addc1fc0d62879b41c55 /net/mac80211/main.c | |
parent | 5a8c271b26b83a09924c99aaa5c607021aed142b (diff) | |
parent | cfac337b0fbcad5181096ab72bb24a05bd444562 (diff) | |
download | linux-fsl-qoriq-a0008bf73c12212769b0d0b19cdec5c432de94ba.tar.xz |
Merge branch 'lpc32xx/fixes-non-critical' of git://git.antcom.de/linux-2.6 into next/fixes-non-critical
* 'lpc32xx/fixes-non-critical' of git://git.antcom.de/linux-2.6: (1 commit)
ARM: LPC32xx: Fix missing and bad LPC32XX macros
Update to Linux 3.3-rc5
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/mac80211/main.c')
-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 0a0d94a..b142bd4 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, |