diff options
| author | Reinette Chatre <reinette.chatre@intel.com> | 2008-02-06 14:20:38 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-02-15 13:44:17 -0500 |
| commit | 9788864e2169ed3611e61c097efe4944c23fe7e9 (patch) | |
| tree | 5c99b99dacc0be16c9f83f4dde0c9979f84b61aa /drivers/net/wireless | |
| parent | a97b1f3d203d0fe5503578c6ee8bfdb89ed72679 (diff) | |
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')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 5ee1ad69898b..b6f19a52b783 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
| @@ -6256,6 +6256,8 @@ static void __iwl3945_down(struct iwl3945_priv *priv) | |||
| 6256 | STATUS_RF_KILL_HW | | 6256 | STATUS_RF_KILL_HW | |
| 6257 | test_bit(STATUS_RF_KILL_SW, &priv->status) << | 6257 | test_bit(STATUS_RF_KILL_SW, &priv->status) << |
| 6258 | STATUS_RF_KILL_SW | | 6258 | STATUS_RF_KILL_SW | |
| 6259 | test_bit(STATUS_GEO_CONFIGURED, &priv->status) << | ||
| 6260 | STATUS_GEO_CONFIGURED | | ||
| 6259 | test_bit(STATUS_IN_SUSPEND, &priv->status) << | 6261 | test_bit(STATUS_IN_SUSPEND, &priv->status) << |
| 6260 | STATUS_IN_SUSPEND; | 6262 | STATUS_IN_SUSPEND; |
| 6261 | goto exit; | 6263 | goto exit; |
| @@ -6267,6 +6269,8 @@ static void __iwl3945_down(struct iwl3945_priv *priv) | |||
| 6267 | STATUS_RF_KILL_HW | | 6269 | STATUS_RF_KILL_HW | |
| 6268 | test_bit(STATUS_RF_KILL_SW, &priv->status) << | 6270 | test_bit(STATUS_RF_KILL_SW, &priv->status) << |
| 6269 | STATUS_RF_KILL_SW | | 6271 | STATUS_RF_KILL_SW | |
| 6272 | test_bit(STATUS_GEO_CONFIGURED, &priv->status) << | ||
| 6273 | STATUS_GEO_CONFIGURED | | ||
| 6270 | test_bit(STATUS_IN_SUSPEND, &priv->status) << | 6274 | test_bit(STATUS_IN_SUSPEND, &priv->status) << |
| 6271 | STATUS_IN_SUSPEND | | 6275 | STATUS_IN_SUSPEND | |
| 6272 | test_bit(STATUS_FW_ERROR, &priv->status) << | 6276 | test_bit(STATUS_FW_ERROR, &priv->status) << |
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) | |||
| 6680 | STATUS_RF_KILL_HW | | 6680 | STATUS_RF_KILL_HW | |
| 6681 | test_bit(STATUS_RF_KILL_SW, &priv->status) << | 6681 | test_bit(STATUS_RF_KILL_SW, &priv->status) << |
| 6682 | STATUS_RF_KILL_SW | | 6682 | STATUS_RF_KILL_SW | |
| 6683 | test_bit(STATUS_GEO_CONFIGURED, &priv->status) << | ||
| 6684 | STATUS_GEO_CONFIGURED | | ||
| 6683 | test_bit(STATUS_IN_SUSPEND, &priv->status) << | 6685 | test_bit(STATUS_IN_SUSPEND, &priv->status) << |
| 6684 | STATUS_IN_SUSPEND; | 6686 | STATUS_IN_SUSPEND; |
| 6685 | goto exit; | 6687 | goto exit; |
| @@ -6691,6 +6693,8 @@ static void __iwl4965_down(struct iwl4965_priv *priv) | |||
| 6691 | STATUS_RF_KILL_HW | | 6693 | STATUS_RF_KILL_HW | |
| 6692 | test_bit(STATUS_RF_KILL_SW, &priv->status) << | 6694 | test_bit(STATUS_RF_KILL_SW, &priv->status) << |
| 6693 | STATUS_RF_KILL_SW | | 6695 | STATUS_RF_KILL_SW | |
| 6696 | test_bit(STATUS_GEO_CONFIGURED, &priv->status) << | ||
| 6697 | STATUS_GEO_CONFIGURED | | ||
| 6694 | test_bit(STATUS_IN_SUSPEND, &priv->status) << | 6698 | test_bit(STATUS_IN_SUSPEND, &priv->status) << |
| 6695 | STATUS_IN_SUSPEND | | 6699 | STATUS_IN_SUSPEND | |
| 6696 | test_bit(STATUS_FW_ERROR, &priv->status) << | 6700 | test_bit(STATUS_FW_ERROR, &priv->status) << |