Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e47f2509 authored by Fabio Baltieri's avatar Fabio Baltieri Committed by Johannes Berg
Browse files

mac80211: use oneshot blink API for LED triggers 



Change mac80211 LED trigger code to use the generic
led_trigger_blink_oneshot() API for transmit and receive activity
indication.

This gives a better feedback to the user, as with the new API each
activity event results in a visible blink, while a constant traffic
results in a continuous blink at constant rate.

Signed-off-by: default avatarFabio Baltieri <fabio.baltieri@gmail.com>
[fix LED disabled build error]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c82b5a74

net/mac80211/ieee80211_i.h

+0 −1
Original line number Diff line number Diff line
@@ -1094,7 +1094,6 @@ struct ieee80211_local { 
	u32 dot11TransmittedFrameCount;



#ifdef CONFIG_MAC80211_LEDS

	int tx_led_counter, rx_led_counter;

	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],

net/mac80211/led.c

+7 −12
Original line number Diff line number Diff line
@@ -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)

net/mac80211/led.h

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


#ifdef CONFIG_MAC80211_LEDS

void ieee80211_led_rx(struct ieee80211_local *local);

void ieee80211_led_tx(struct ieee80211_local *local, int q);

void ieee80211_led_tx(struct ieee80211_local *local);

void ieee80211_led_assoc(struct ieee80211_local *local,

			 bool associated);

void ieee80211_led_radio(struct ieee80211_local *local,
@@ -27,7 +27,7 @@ void ieee80211_mod_tpt_led_trig(struct ieee80211_local *local, 
static inline void ieee80211_led_rx(struct ieee80211_local *local)

{

}

static inline void ieee80211_led_tx(struct ieee80211_local *local, int q)

static inline void ieee80211_led_tx(struct ieee80211_local *local)

{

}

static inline void ieee80211_led_assoc(struct ieee80211_local *local,

net/mac80211/status.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) 


	rcu_read_unlock();



	ieee80211_led_tx(local, 0);

	ieee80211_led_tx(local);



	/* SNMP counters

	 * Fragments are passed to low-level drivers as separate skbs, so these

net/mac80211/tx.c

+0 −1
Original line number Diff line number Diff line
@@ -1300,7 +1300,6 @@ static bool __ieee80211_tx(struct ieee80211_local *local, 
				    txpending);



	ieee80211_tpt_led_trig_tx(local, fc, led_len);

	ieee80211_led_tx(local, 1);



	WARN_ON_ONCE(!skb_queue_empty(skbs));