* [PATCH] network: led-blink: update mac80211 patch
@ 2015-05-08 20:42 Arend van Spriel
2015-05-11 18:19 ` Hauke Mehrtens
0 siblings, 1 reply; 3+ messages in thread
From: Arend van Spriel @ 2015-05-08 20:42 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: backports, Arend van Spriel
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
.../network/0024-led-blink-api/mac80211.patch | 36 ++++++++++++----------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch b/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch
index de7f5b2..0f443f1 100644
--- a/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch
+++ b/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch
@@ -1,51 +1,55 @@
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
-@@ -1277,6 +1277,9 @@ struct ieee80211_local {
- u32 dot11TransmittedFrameCount;
+@@ -1260,6 +1260,9 @@ struct ieee80211_local {
+ struct mutex chanctx_mtx;
#ifdef CONFIG_MAC80211_LEDS
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
+ int tx_led_counter, rx_led_counter;
+#endif
- struct led_trigger *tx_led, *rx_led, *assoc_led, *radio_led;
- struct tpt_led_trigger *tpt_led_trigger;
- char tx_led_name[32], rx_led_name[32],
---- a/net/mac80211/led.c
-+++ b/net/mac80211/led.c
-@@ -16,18 +16,36 @@
-
- void ieee80211_led_rx(struct ieee80211_local *local)
+ struct led_trigger tx_led, rx_led, assoc_led, radio_led;
+ struct led_trigger tpt_led;
+ atomic_t tx_led_active, rx_led_active, assoc_led_active;
+--- a/net/mac80211/led.h
++++ b/net/mac80211/led.h
+@@ -16,22 +16,38 @@
+ static inline void ieee80211_led_rx(struct ieee80211_local *local)
{
+ #ifdef CONFIG_MAC80211_LEDS
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
unsigned long led_delay = MAC80211_BLINK_DELAY;
+-
+#endif
- if (unlikely(!local->rx_led))
+ if (!atomic_read(&local->rx_led_active))
return;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
- led_trigger_blink_oneshot(local->rx_led, &led_delay, &led_delay, 0);
+ led_trigger_blink_oneshot(&local->rx_led, &led_delay, &led_delay, 0);
+#else
+ if (local->rx_led_counter++ % 2 == 0)
+ led_trigger_event(local->rx_led, LED_OFF);
+ else
+ led_trigger_event(local->rx_led, LED_FULL);
+#endif
+ #endif
}
- void ieee80211_led_tx(struct ieee80211_local *local)
+ static inline void ieee80211_led_tx(struct ieee80211_local *local)
{
+ #ifdef CONFIG_MAC80211_LEDS
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
unsigned long led_delay = MAC80211_BLINK_DELAY;
+-
+#endif
- if (unlikely(!local->tx_led))
+ if (!atomic_read(&local->tx_led_active))
return;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
- led_trigger_blink_oneshot(local->tx_led, &led_delay, &led_delay, 0);
+ led_trigger_blink_oneshot(&local->tx_led, &led_delay, &led_delay, 0);
+#else
+ if (local->tx_led_counter++ % 2 == 0)
+ led_trigger_event(local->tx_led, LED_OFF);
+ else
+ led_trigger_event(local->tx_led, LED_FULL);
+#endif
+ #endif
}
- void ieee80211_led_assoc(struct ieee80211_local *local, bool associated)
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] network: led-blink: update mac80211 patch
2015-05-08 20:42 [PATCH] network: led-blink: update mac80211 patch Arend van Spriel
@ 2015-05-11 18:19 ` Hauke Mehrtens
2015-05-12 8:22 ` Arend van Spriel
0 siblings, 1 reply; 3+ messages in thread
From: Hauke Mehrtens @ 2015-05-11 18:19 UTC (permalink / raw)
To: Arend van Spriel, Luis R. Rodriguez; +Cc: backports, Johannes Berg
On 05/08/2015 10:42 PM, Arend van Spriel wrote:
> Signed-off-by: Arend van Spriel <arend@broadcom.com>
> ---
> .../network/0024-led-blink-api/mac80211.patch | 36 ++++++++++++----------
> 1 file changed, 20 insertions(+), 16 deletions(-)
>
This looks like the patch "backports: update mac80211 LED patch"
Johannes send at 5.5.2015.
Hauke
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] network: led-blink: update mac80211 patch
2015-05-11 18:19 ` Hauke Mehrtens
@ 2015-05-12 8:22 ` Arend van Spriel
0 siblings, 0 replies; 3+ messages in thread
From: Arend van Spriel @ 2015-05-12 8:22 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: Luis R. Rodriguez, backports, Johannes Berg
On 05/11/15 20:19, Hauke Mehrtens wrote:
> On 05/08/2015 10:42 PM, Arend van Spriel wrote:
>> Signed-off-by: Arend van Spriel<arend@broadcom.com>
>> ---
>> .../network/0024-led-blink-api/mac80211.patch | 36 ++++++++++++----------
>> 1 file changed, 20 insertions(+), 16 deletions(-)
>>
> This looks like the patch "backports: update mac80211 LED patch"
> Johannes send at 5.5.2015.
Ah. Missed that one. Thanks.
Arend
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-12 8:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-08 20:42 [PATCH] network: led-blink: update mac80211 patch Arend van Spriel
2015-05-11 18:19 ` Hauke Mehrtens
2015-05-12 8:22 ` Arend van Spriel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.