diff options
| author | Michael Büsch <mb@bu3sch.de> | 2008-02-15 22:47:47 +0000 |
|---|---|---|
| committer | Michael Büsch <mb@bu3sch.de> | 2008-02-15 22:47:47 +0000 |
| commit | 99aaf500ed5ca39f30cebf79dc0ee9ff1fd8becf (patch) | |
| tree | 382f2e40c89aea52fbc7223c66466e1cd4138def /package/b43/src/leds.c | |
| parent | 4e45a1d1acaaf25be8bd435031634ad23a5a205d (diff) | |
| download | upstream-99aaf500ed5ca39f30cebf79dc0ee9ff1fd8becf.tar.gz upstream-99aaf500ed5ca39f30cebf79dc0ee9ff1fd8becf.tar.bz2 upstream-99aaf500ed5ca39f30cebf79dc0ee9ff1fd8becf.zip | |
Upgrade b43 and mac80211.
This also temporarly disables hostapd support for mac80211, as hostapd needs patches to compile against latest mac80211.
Will do that in a seperate patch.
SVN-Revision: 10466
Diffstat (limited to 'package/b43/src/leds.c')
| -rw-r--r-- | package/b43/src/leds.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/package/b43/src/leds.c b/package/b43/src/leds.c index 19e588582c..4b590d8c65 100644 --- a/package/b43/src/leds.c +++ b/package/b43/src/leds.c @@ -4,7 +4,7 @@ LED control Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>, - Copyright (c) 2005 Stefano Brivio <st3@riseup.net> + Copyright (c) 2005 Stefano Brivio <stefano.brivio@polimi.it> Copyright (c) 2005-2007 Michael Buesch <mb@bu3sch.de> Copyright (c) 2005 Danny van Dyk <kugelfang@gentoo.org> Copyright (c) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch> @@ -163,6 +163,9 @@ static void b43_map_led(struct b43_wldev *dev, b43_register_led(dev, &dev->led_radio, name, b43_rfkill_led_name(dev), led_index, activelow); + /* Sync the RF-kill LED state with the switch state. */ + if (dev->radio_hw_enable) + b43_led_turn_on(dev, led_index, activelow); break; case B43_LED_WEIRD: case B43_LED_ASSOC: @@ -187,10 +190,10 @@ void b43_leds_init(struct b43_wldev *dev) enum b43_led_behaviour behaviour; bool activelow; - sprom[0] = bus->sprom.r1.gpio0; - sprom[1] = bus->sprom.r1.gpio1; - sprom[2] = bus->sprom.r1.gpio2; - sprom[3] = bus->sprom.r1.gpio3; + sprom[0] = bus->sprom.gpio0; + sprom[1] = bus->sprom.gpio1; + sprom[2] = bus->sprom.gpio2; + sprom[3] = bus->sprom.gpio3; for (i = 0; i < 4; i++) { if (sprom[i] == 0xFF) { @@ -232,4 +235,5 @@ void b43_leds_exit(struct b43_wldev *dev) b43_unregister_led(&dev->led_tx); b43_unregister_led(&dev->led_rx); b43_unregister_led(&dev->led_assoc); + b43_unregister_led(&dev->led_radio); } |