diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-09 15:08:10 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-09 15:08:10 -0400 |
| commit | fa5978447cb0144411df3a588e3d01459c12d855 (patch) | |
| tree | 998e58c515def864c8cd87511625d1e7184a7a21 /net/mac80211/led.c | |
| parent | 2437f3c5d6bc07252c6d7d24448755e0c35ed91c (diff) | |
| parent | 73da7d5bab79ad7e16ff44d67c3fe8b9c0b33e5b (diff) | |
| download | blackbird-op-linux-fa5978447cb0144411df3a588e3d01459c12d855.tar.gz blackbird-op-linux-fa5978447cb0144411df3a588e3d01459c12d855.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/led.c')
| -rw-r--r-- | net/mac80211/led.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/net/mac80211/led.c b/net/mac80211/led.c index bcffa6903129..e2b836446af3 100644 --- a/net/mac80211/led.c +++ b/net/mac80211/led.c @@ -12,27 +12,22 @@ #include <linux/export.h> #include "led.h" +#define MAC80211_BLINK_DELAY 50 /* ms */ + void ieee80211_led_rx(struct ieee80211_local *local) { + unsigned long led_delay = MAC80211_BLINK_DELAY; if (unlikely(!local->rx_led)) return; - if (local->rx_led_counter++ % 2 == 0) - led_trigger_event(local->rx_led, LED_OFF); - else - led_trigger_event(local->rx_led, LED_FULL); + led_trigger_blink_oneshot(local->rx_led, &led_delay, &led_delay, 0); } -/* q is 1 if a packet was enqueued, 0 if it has been transmitted */ -void ieee80211_led_tx(struct ieee80211_local *local, int q) +void ieee80211_led_tx(struct ieee80211_local *local) { + unsigned long led_delay = MAC80211_BLINK_DELAY; if (unlikely(!local->tx_led)) return; - /* not sure how this is supposed to work ... */ - local->tx_led_counter += 2*q-1; - if (local->tx_led_counter % 2 == 0) - led_trigger_event(local->tx_led, LED_OFF); - else - led_trigger_event(local->tx_led, LED_FULL); + led_trigger_blink_oneshot(local->tx_led, &led_delay, &led_delay, 0); } void ieee80211_led_assoc(struct ieee80211_local *local, bool associated) |
