diff options
| author |   Ilan Peer <ilan.peer@intel.com> | 2012-05-17 12:42:59 +0300 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2012-06-06 13:08:41 +0200 |
| commit | 76a3aa89937cf0b9a560e4c778e54e993018da60 (patch) | |
| tree | c8c1610b1c16fa1a704c5dd1c073fed9f352652d | |
| parent | iwlwifi: give HT format to mac80211/radiotap (diff) | |
| download | linux-dev-76a3aa89937cf0b9a560e4c778e54e993018da60.tar.xz linux-dev-76a3aa89937cf0b9a560e4c778e54e993018da60.zip | |
iwlwifi: clear STATUS_SCAN_HW when PAN_PARAMS fails
The STATUS_SCAN_HW is set before calling iwlagn_set_pan_params
(used as an input to calculate slot time allocation). The bit needs
to be cleared in case sending the command fails.
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 069849e66234..a32b35ea9e60 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -966,8 +966,10 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) set_bit(STATUS_SCAN_HW, &priv->status); ret = iwlagn_set_pan_params(priv); - if (ret) + if (ret) { + clear_bit(STATUS_SCAN_HW, &priv->status); return ret; + } ret = iwl_dvm_send_cmd(priv, &cmd); if (ret) { |