Commit 749e091e authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by John W. Linville
Browse files

iwl3945: improve 3945 leds 

'tpt' is a delta throughput (number of packets) and is corelated
to brightness of the LED. We already maintain a delta of packets in
rxtxpackets. There is no need to calculate this delta again which
was affecting the behaviour of LEDS.

Also add two new callback functions for ASSOCIATED/DISASSOCIATED states
where LED's will be *on* for associated state and *off* for disassociated state.

This fixes
http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1771

.

Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2c7e5798

drivers/net/wireless/iwlwifi/iwl-3945-led.c

+46 −24
Original line number Diff line number Diff line
@@ -44,6 +44,15 @@ 
#include "iwl-core.h"

#include "iwl-dev.h"



#ifdef CONFIG_IWLWIFI_DEBUG

static const char *led_type_str[] = {

	__stringify(IWL_LED_TRG_TX),

	__stringify(IWL_LED_TRG_RX),

	__stringify(IWL_LED_TRG_ASSOC),

	__stringify(IWL_LED_TRG_RADIO),

	NULL

};

#endif /* CONFIG_IWLWIFI_DEBUG */



static const struct {

	u16 brightness;
@@ -142,6 +151,30 @@ static int iwl3945_led_off(struct iwl_priv *priv, int led_id) 
	return iwl_send_led_cmd(priv, &led_cmd);

}



/*

 *  Set led on in case of association

 *  */

static int iwl3945_led_associate(struct iwl_priv *priv, int led_id)

{

	IWL_DEBUG_LED(priv, "Associated\n");



	priv->allow_blinking = 1;

	return iwl3945_led_on(priv, led_id);

}

/* Set Led off in case of disassociation */

static int iwl3945_led_disassociate(struct iwl_priv *priv, int led_id)

{

	IWL_DEBUG_LED(priv, "Disassociated\n");



	priv->allow_blinking = 0;

	if (iwl_is_rfkill(priv))

		iwl3945_led_off(priv, led_id);

	else

		iwl3945_led_on(priv, led_id);



	return 0;

}



/*

 * brightness call back function for Tx/Rx LED

 */
@@ -171,20 +204,15 @@ static void iwl3945_led_brightness_set(struct led_classdev *led_cdev, 
	if (test_bit(STATUS_EXIT_PENDING, &priv->status))

		return;



	IWL_DEBUG_LED(priv, "Led type = %s brightness = %d\n",

			led_type_str[led->type], brightness);



	switch (brightness) {

	case LED_FULL:

		if (led->type == IWL_LED_TRG_ASSOC) {

			priv->allow_blinking = 1;

			IWL_DEBUG_LED(priv, "MAC is  associated\n");

		}

		if (led->led_on)

			led->led_on(priv, IWL_LED_LINK);

		break;

	case LED_OFF:

		if (led->type == IWL_LED_TRG_ASSOC) {

			priv->allow_blinking = 0;

			IWL_DEBUG_LED(priv, "MAC is disassociated\n");

		}

		if (led->led_off)

			led->led_off(priv, IWL_LED_LINK);

		break;
@@ -197,8 +225,6 @@ static void iwl3945_led_brightness_set(struct led_classdev *led_cdev, 
	}

}







/*

 * Register led class with the system

 */
@@ -237,12 +263,12 @@ static int iwl3945_led_register_led(struct iwl_priv *priv, 
static inline u8 get_blink_rate(struct iwl_priv *priv)

{

	int index;

	u64 current_tpt = priv->rxtxpackets;

	s64 tpt = current_tpt - priv->led_tpt;

	s64 tpt = priv->rxtxpackets;



	if (tpt < 0)

		tpt = -tpt;

	priv->led_tpt = current_tpt;



	IWL_DEBUG_LED(priv, "tpt %lld \n", (long long)tpt);



	if (!priv->allow_blinking)

		index = IWL_MAX_BLINK_TBL;
@@ -250,13 +276,9 @@ static inline u8 get_blink_rate(struct iwl_priv *priv) 
		for (index = 0; index < IWL_MAX_BLINK_TBL; index++)

			if (tpt > (blink_tbl[index].brightness * IWL_1MB_RATE))

				break;

	return index;

}



static inline int is_rf_kill(struct iwl_priv *priv)

{

	return test_bit(STATUS_RF_KILL_HW, &priv->status) ||

		test_bit(STATUS_RF_KILL_SW, &priv->status);

	IWL_DEBUG_LED(priv, "LED BLINK IDX=%d\n", index);

	return index;

}



/*
@@ -272,7 +294,7 @@ void iwl3945_led_background(struct iwl_priv *priv) 
		priv->last_blink_time = 0;

		return;

	}

	if (is_rf_kill(priv)) {

	if (iwl_is_rfkill(priv)) {

		priv->last_blink_time = 0;

		return;

	}
@@ -341,8 +363,8 @@ int iwl3945_led_register(struct iwl_priv *priv) 
				   IWL_LED_TRG_ASSOC, 0, trigger);



	/* for assoc always turn led on */

	priv->led[IWL_LED_TRG_ASSOC].led_on = iwl3945_led_on;

	priv->led[IWL_LED_TRG_ASSOC].led_off = iwl3945_led_on;

	priv->led[IWL_LED_TRG_ASSOC].led_on = iwl3945_led_associate;

	priv->led[IWL_LED_TRG_ASSOC].led_off = iwl3945_led_disassociate;

	priv->led[IWL_LED_TRG_ASSOC].led_pattern = NULL;



	if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE