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

Commit f2bffa7e authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by John W. Linville
Browse files

ath9k: Fix LED blink pattern 



Signed-off-by: default avatarVasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c0415b54

drivers/net/wireless/ath9k/core.h

+10 −0
Original line number Diff line number Diff line
@@ -600,6 +600,8 @@ struct ath_ani { 
/********************/



#define ATH_LED_PIN	1

#define ATH_LED_ON_DURATION_IDLE	350	/* in msecs */

#define ATH_LED_OFF_DURATION_IDLE	250	/* in msecs */



enum ath_led_type {

	ATH_LED_RADIO,
@@ -677,6 +679,7 @@ enum PROT_MODE { 
#define SC_OP_RFKILL_SW_BLOCKED	BIT(12)

#define SC_OP_RFKILL_HW_BLOCKED	BIT(13)

#define SC_OP_WAIT_FOR_BEACON	BIT(14)

#define SC_OP_LED_ON		BIT(15)



struct ath_bus_ops {

	void		(*read_cachesize)(struct ath_softc *sc, int *csz);
@@ -725,10 +728,17 @@ struct ath_softc { 
	struct ath_rate_table *hw_rate_table[ATH9K_MODE_MAX];

	struct ath_rate_table *cur_rate_table;

	struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];



	struct ath_led radio_led;

	struct ath_led assoc_led;

	struct ath_led tx_led;

	struct ath_led rx_led;

	struct delayed_work ath_led_blink_work;

	int led_on_duration;

	int led_off_duration;

	int led_on_cnt;

	int led_off_cnt;



	struct ath_rfkill rf_kill;

	struct ath_ani sc_ani;

	struct ath9k_node_stats sc_halstats;

drivers/net/wireless/ath9k/main.c

+46 −6
Original line number Diff line number Diff line
@@ -935,6 +935,32 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc, 
/*	 LED functions		*/

/********************************/



static void ath_led_blink_work(struct work_struct *work)

{

	struct ath_softc *sc = container_of(work, struct ath_softc,

					    ath_led_blink_work.work);



	if (!(sc->sc_flags & SC_OP_LED_ASSOCIATED))

		return;

	ath9k_hw_set_gpio(sc->sc_ah, ATH_LED_PIN,

			  (sc->sc_flags & SC_OP_LED_ON) ? 1 : 0);



	queue_delayed_work(sc->hw->workqueue, &sc->ath_led_blink_work,

			   (sc->sc_flags & SC_OP_LED_ON) ?

			   msecs_to_jiffies(sc->led_off_duration) :

			   msecs_to_jiffies(sc->led_on_duration));



	sc->led_on_duration =

			max((ATH_LED_ON_DURATION_IDLE - sc->led_on_cnt), 25);

	sc->led_off_duration =

			max((ATH_LED_OFF_DURATION_IDLE - sc->led_off_cnt), 10);

	sc->led_on_cnt = sc->led_off_cnt = 0;

	if (sc->sc_flags & SC_OP_LED_ON)

		sc->sc_flags &= ~SC_OP_LED_ON;

	else

		sc->sc_flags |= SC_OP_LED_ON;

}



static void ath_led_brightness(struct led_classdev *led_cdev,

			       enum led_brightness brightness)

{
@@ -944,16 +970,27 @@ static void ath_led_brightness(struct led_classdev *led_cdev, 
	switch (brightness) {

	case LED_OFF:

		if (led->led_type == ATH_LED_ASSOC ||

		    led->led_type == ATH_LED_RADIO)

			sc->sc_flags &= ~SC_OP_LED_ASSOCIATED;

		    led->led_type == ATH_LED_RADIO) {

			ath9k_hw_set_gpio(sc->sc_ah, ATH_LED_PIN,

				(led->led_type == ATH_LED_RADIO) ? 1 :

				!!(sc->sc_flags & SC_OP_LED_ASSOCIATED));

				(led->led_type == ATH_LED_RADIO));

			sc->sc_flags &= ~SC_OP_LED_ASSOCIATED;

			if (led->led_type == ATH_LED_RADIO)

				sc->sc_flags &= ~SC_OP_LED_ON;

		} else {

			sc->led_off_cnt++;

		}

		break;

	case LED_FULL:

		if (led->led_type == ATH_LED_ASSOC)

		if (led->led_type == ATH_LED_ASSOC) {

			sc->sc_flags |= SC_OP_LED_ASSOCIATED;

			queue_delayed_work(sc->hw->workqueue,

					   &sc->ath_led_blink_work, 0);

		} else if (led->led_type == ATH_LED_RADIO) {

			ath9k_hw_set_gpio(sc->sc_ah, ATH_LED_PIN, 0);

			sc->sc_flags |= SC_OP_LED_ON;

		} else {

			sc->led_on_cnt++;

		}

		break;

	default:

		break;
@@ -989,6 +1026,7 @@ static void ath_unregister_led(struct ath_led *led) 


static void ath_deinit_leds(struct ath_softc *sc)

{

	cancel_delayed_work_sync(&sc->ath_led_blink_work);

	ath_unregister_led(&sc->assoc_led);

	sc->sc_flags &= ~SC_OP_LED_ASSOCIATED;

	ath_unregister_led(&sc->tx_led);
@@ -1008,6 +1046,8 @@ static void ath_init_leds(struct ath_softc *sc) 
	/* LED off, active low */

	ath9k_hw_set_gpio(sc->sc_ah, ATH_LED_PIN, 1);



	INIT_DELAYED_WORK(&sc->ath_led_blink_work, ath_led_blink_work);



	trigger = ieee80211_get_radio_led_name(sc->hw);

	snprintf(sc->radio_led.name, sizeof(sc->radio_led.name),

		"ath9k-%s:radio", wiphy_name(sc->hw->wiphy));