patches: refresh on kernel v4.16-rc3
[openwrt/staging/blogic.git] / patches / 0024-led-blink-api / mac80211.patch
1 --- a/net/mac80211/ieee80211_i.h
2 +++ b/net/mac80211/ieee80211_i.h
3 @@ -1281,6 +1281,7 @@ struct ieee80211_local {
4 struct mutex chanctx_mtx;
5
6 #ifdef CONFIG_MAC80211_LEDS
7 + int tx_led_counter, rx_led_counter;
8 struct led_trigger tx_led, rx_led, assoc_led, radio_led;
9 struct led_trigger tpt_led;
10 atomic_t tx_led_active, rx_led_active, assoc_led_active;
11 --- a/net/mac80211/led.h
12 +++ b/net/mac80211/led.h
13 @@ -16,22 +16,36 @@
14 static inline void ieee80211_led_rx(struct ieee80211_local *local)
15 {
16 #ifdef CONFIG_MAC80211_LEDS
17 - unsigned long led_delay = MAC80211_BLINK_DELAY;
18 + unsigned long led_delay __maybe_unused = MAC80211_BLINK_DELAY;
19
20 if (!atomic_read(&local->rx_led_active))
21 return;
22 +#if LINUX_VERSION_IS_GEQ(3,6,0)
23 led_trigger_blink_oneshot(&local->rx_led, &led_delay, &led_delay, 0);
24 +#else
25 + if (local->rx_led_counter++ % 2 == 0)
26 + led_trigger_event(&local->rx_led, LED_OFF);
27 + else
28 + led_trigger_event(&local->rx_led, LED_FULL);
29 +#endif
30 #endif
31 }
32
33 static inline void ieee80211_led_tx(struct ieee80211_local *local)
34 {
35 #ifdef CONFIG_MAC80211_LEDS
36 - unsigned long led_delay = MAC80211_BLINK_DELAY;
37 + unsigned long led_delay __maybe_unused = MAC80211_BLINK_DELAY;
38
39 if (!atomic_read(&local->tx_led_active))
40 return;
41 +#if LINUX_VERSION_IS_GEQ(3,6,0)
42 led_trigger_blink_oneshot(&local->tx_led, &led_delay, &led_delay, 0);
43 +#else
44 + if (local->tx_led_counter++ % 2 == 0)
45 + led_trigger_event(&local->tx_led, LED_OFF);
46 + else
47 + led_trigger_event(&local->tx_led, LED_FULL);
48 +#endif
49 #endif
50 }
51