iwlwifi: fix dual-mode scanning

The recent scanning code shuffle accidentally
moved the SCAN_HW bit setting _after_ the PAN
parameters are modified, which means that they
don't take the scan into account -- fix that.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 0ad0d44893ab..c1a389883af0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1565,13 +1565,15 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         cmd.data = scan;
         scan->len = cpu_to_le16(cmd.len);
 
+        /* set scan bit here for PAN params */
+        set_bit(STATUS_SCAN_HW, &priv->status);
+
         if (priv->cfg->ops->hcmd->set_pan_params) {
                 ret = priv->cfg->ops->hcmd->set_pan_params(priv);
                 if (ret)
                         return ret;
         }
 
-        set_bit(STATUS_SCAN_HW, &priv->status);
         ret = iwl_send_cmd_sync(priv, &cmd);
         if (ret) {
                 clear_bit(STATUS_SCAN_HW, &priv->status);