diff options
author | Ilan Peer <ilan.peer@intel.com> | 2012-05-17 05:42:59 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-06 07:08:41 -0400 |
commit | 76a3aa89937cf0b9a560e4c778e54e993018da60 (patch) | |
tree | c8c1610b1c16fa1a704c5dd1c073fed9f352652d /drivers/net/wireless/iwlwifi | |
parent | 53e1116ebd3c0bab4d6daf0da4492f813b778cf8 (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-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) | |||
966 | set_bit(STATUS_SCAN_HW, &priv->status); | 966 | set_bit(STATUS_SCAN_HW, &priv->status); |
967 | 967 | ||
968 | ret = iwlagn_set_pan_params(priv); | 968 | ret = iwlagn_set_pan_params(priv); |
969 | if (ret) | 969 | if (ret) { |
970 | clear_bit(STATUS_SCAN_HW, &priv->status); | ||
970 | return ret; | 971 | return ret; |
972 | } | ||
971 | 973 | ||
972 | ret = iwl_dvm_send_cmd(priv, &cmd); | 974 | ret = iwl_dvm_send_cmd(priv, &cmd); |
973 | if (ret) { | 975 | if (ret) { |