diff options
| author | Emmanuel Grumbach | 2008-06-30 11:23:25 +0200 |
|---|---|---|
| committer | John W. Linville | 2008-06-30 23:37:44 +0200 |
| commit | a9efa652cbfead13bbe200878f8a2d74f3543e1b (patch) | |
| tree | d8f42b1a09053750c0f74710232669a95da33134 /drivers/net/wireless/iwlwifi/iwl4965-base.c | |
| parent | iwlwifi: blocking mac_start until uCode is complete (diff) | |
| download | kernel-qcow2-linux-a9efa652cbfead13bbe200878f8a2d74f3543e1b.tar.gz kernel-qcow2-linux-a9efa652cbfead13bbe200878f8a2d74f3543e1b.tar.xz kernel-qcow2-linux-a9efa652cbfead13bbe200878f8a2d74f3543e1b.zip | |
iwlwifi: clean up HW RF-kill state machine and restarts
This patch cleans up HW RF-kill state machine.
Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index e9b6f3099d8e..a4aebe196003 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -1606,14 +1606,12 @@ static void iwl4965_irq_tasklet(struct iwl_priv *priv) IWL_DEBUG(IWL_DL_RF_KILL, "RF_KILL bit toggled to %s.\n", hw_rf_kill ? "disable radio":"enable radio"); - /* Queue restart only if RF_KILL switch was set to "kill" - * when we loaded driver, and is now set to "enable". - * After we're Alive, RF_KILL gets handled by - * iwl4965_rx_card_state_notif() */ - if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) { + /* driver only loads ucode once setting the interface up. + * the driver as well won't allow loading if RFKILL is set + * therefore no need to restart the driver from this handler + */ + if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) clear_bit(STATUS_RF_KILL_HW, &priv->status); - queue_work(priv->workqueue, &priv->restart); - } handled |= CSR_INT_BIT_RF_KILL; } |