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: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-led.c b/drivers/net/wireless/iwlwifi/iwl-3945-led.c
index bd7e520d98c2ecfd51d58bd2fdc4ff53ece72642..225e5f889346806203e2eab6e2a985e6dd74fe4e 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-3945-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-led.c
@@ -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;
 }

diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c
index 19680f72087fc5d84bf100fce29365043689b754..5e64252f80f6f7059b258cd4abd0ef3c8a67c13e 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -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;
 }