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

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

iwl3945/iwlwifi: fix led bug when SW rfkill 

Patch fixes the bug at
http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1903



when SW rfkill is invoked by 'iwconfig txpower off',
the existing connection disassociates and led off command is sent
to the device which returns error as rfkill is 'true'.

Patch fixes this by just avoiding sending the led off/on command when
disassociated. The main purpose of the led_disassociate callback
is to start or stop the blinking.
There are three states in led
1) Always on when radio is on
2) Always off when radio is off
3) blink when associated and if there is some traffic.

In this callback 'allow_blinking' needs to be set false
when associated, as LED will be always on.

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 d14d4440

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

+0 −4
Original line number Diff line number Diff line
@@ -167,10 +167,6 @@ 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;

}

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

+0 −4
Original line number Diff line number Diff line
@@ -176,10 +176,6 @@ static int iwl_led_associate(struct iwl_priv *priv, int led_id) 
static int iwl_led_disassociate(struct iwl_priv *priv, int led_id)

{

	priv->allow_blinking = 0;

	if (iwl_is_rfkill(priv))

		iwl4965_led_off_reg(priv, led_id);

	else

		iwl4965_led_on_reg(priv, led_id);



	return 0;

}