diff options
| author |   Don Fry <donald.h.fry@intel.com> | 2012-03-07 09:52:43 -0800 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2012-03-08 14:02:29 -0500 |
| commit | 1353a7ba7ebe62dedc60a5ba75c434cfad960ede (patch) | |
| tree | 7ce5d4c7e7095f951f3d708da8755762ac3ac253 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | iwlwifi: don't delete AP station directly (diff) | |
| download | linux-dev-1353a7ba7ebe62dedc60a5ba75c434cfad960ede.tar.xz linux-dev-1353a7ba7ebe62dedc60a5ba75c434cfad960ede.zip | |
iwlwifi: correct status bit refactoring errors
I missed a couple of status bits in my refactoring changes. This
fixes the ones I missed.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 8c21db81ba5f..60f1dc640c94 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -819,15 +819,15 @@ void iwl_down(struct iwl_priv *priv) iwl_trans_stop_device(trans(priv)); /* Clear out all status bits but a few that are stable across reset */ - priv->shrd->status &= - test_bit(STATUS_RF_KILL_HW, &priv->status) << + priv->status &= test_bit(STATUS_RF_KILL_HW, &priv->status) << STATUS_RF_KILL_HW | test_bit(STATUS_GEO_CONFIGURED, &priv->status) << STATUS_GEO_CONFIGURED | - test_bit(STATUS_FW_ERROR, &priv->shrd->status) << - STATUS_FW_ERROR | test_bit(STATUS_EXIT_PENDING, &priv->status) << STATUS_EXIT_PENDING; + priv->shrd->status &= + test_bit(STATUS_FW_ERROR, &priv->shrd->status) << + STATUS_FW_ERROR; dev_kfree_skb(priv->beacon_skb); priv->beacon_skb = NULL; |