Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cf26373 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent a313f383

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+3 −1
Original line number Diff line number Diff line
@@ -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);