diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-10 23:41:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-10 23:41:43 -0700 |
| commit | 84503ddd65e804ccdeedee3f307b40d80ff793e6 (patch) | |
| tree | c7b805f441b1d8cb2e86b8411cf2302ff46186b4 /drivers/net/wireless/b43/leds.c | |
| parent | 51611a120e8120290152edd7d0020d22a7f4b4a3 (diff) | |
| parent | 2f0accc13520b2644b85f80aedce10d10d88b0ca (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43/leds.c')
| -rw-r--r-- | drivers/net/wireless/b43/leds.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c index 9a498d3fc65..c8b317094c3 100644 --- a/drivers/net/wireless/b43/leds.c +++ b/drivers/net/wireless/b43/leds.c @@ -28,6 +28,7 @@ #include "b43.h" #include "leds.h" +#include "rfkill.h" static void b43_led_turn_on(struct b43_wldev *dev, u8 led_index, @@ -164,10 +165,10 @@ static void b43_map_led(struct b43_wldev *dev, snprintf(name, sizeof(name), "b43-%s::radio", wiphy_name(hw->wiphy)); b43_register_led(dev, &dev->led_radio, name, - b43_rfkill_led_name(dev), + ieee80211_get_radio_led_name(hw), led_index, activelow); - /* Sync the RF-kill LED state with the switch state. */ - if (dev->radio_hw_enable) + /* Sync the RF-kill LED state with radio and switch states. */ + if (dev->phy.radio_on && b43_is_hw_radio_enabled(dev)) b43_led_turn_on(dev, led_index, activelow); break; case B43_LED_WEIRD: |