diff options
| author | Reinette Chatre | 2008-02-06 20:20:38 +0100 |
|---|---|---|
| committer | John W. Linville | 2008-02-15 19:44:17 +0100 |
| commit | 9788864e2169ed3611e61c097efe4944c23fe7e9 (patch) | |
| tree | 5c99b99dacc0be16c9f83f4dde0c9979f84b61aa /drivers/net/wireless/iwlwifi/iwl4965-base.c | |
| parent | rndis_wlan: enable stall workaround by link quality instead of link speed (diff) | |
| download | kernel-qcow2-linux-9788864e2169ed3611e61c097efe4944c23fe7e9.tar.gz kernel-qcow2-linux-9788864e2169ed3611e61c097efe4944c23fe7e9.tar.xz kernel-qcow2-linux-9788864e2169ed3611e61c097efe4944c23fe7e9.zip | |
iwlwifi: do not clear GEO_CONFIGURED bit when calling _down
The geos information is set up during probe and should only
be removed during pci_remove, not during _down.
This is a temporary fix until the setting of the status bits
have been cleaned up (to explicitly match all setting with
clearing of status bits).
Signed-off-by: Reinette Chatre <reinette.chatre@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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index f423241b9567..8bedc0c311fb 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -6680,6 +6680,8 @@ static void __iwl4965_down(struct iwl4965_priv *priv) STATUS_RF_KILL_HW | test_bit(STATUS_RF_KILL_SW, &priv->status) << STATUS_RF_KILL_SW | + test_bit(STATUS_GEO_CONFIGURED, &priv->status) << + STATUS_GEO_CONFIGURED | test_bit(STATUS_IN_SUSPEND, &priv->status) << STATUS_IN_SUSPEND; goto exit; @@ -6691,6 +6693,8 @@ static void __iwl4965_down(struct iwl4965_priv *priv) STATUS_RF_KILL_HW | test_bit(STATUS_RF_KILL_SW, &priv->status) << STATUS_RF_KILL_SW | + test_bit(STATUS_GEO_CONFIGURED, &priv->status) << + STATUS_GEO_CONFIGURED | test_bit(STATUS_IN_SUSPEND, &priv->status) << STATUS_IN_SUSPEND | test_bit(STATUS_FW_ERROR, &priv->status) << |