Commit 39e9e796 authored by Ayala Beker's avatar Ayala Beker Committed by Luca Coelho
Browse files

iwlwifi: mvm: correctly set channel flags 



In case of forced passive scan on a UHB channel,
don't set the direct probe option for this channel.

Signed-off-by: default avatarAyala Beker <ayala.beker@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211219121514.0ede76a9ca92.Ie64a4df79ea9c485ae3d2fc043319e8f79cefa8e@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 8bdc52b9

drivers/net/wireless/intel/iwlwifi/mvm/scan.c

+4 −3
Original line number Diff line number Diff line
@@ -1826,8 +1826,6 @@ iwl_mvm_umac_scan_cfg_channels_v6_6g(struct iwl_mvm_scan_params *params, 
			}

		}



		flags = bssid_bitmap | (s_ssid_bitmap << 16);



		if (cfg80211_channel_is_psc(params->channels[i]) &&

		    psc_no_listen)

			flags |= IWL_UHB_CHAN_CFG_FLAG_PSC_CHAN_NO_LISTEN;
@@ -1869,8 +1867,11 @@ iwl_mvm_umac_scan_cfg_channels_v6_6g(struct iwl_mvm_scan_params *params, 
					  (s_max > 1 || b_max > 3));

		}

		if ((allow_passive && force_passive) ||

		    (!flags && !cfg80211_channel_is_psc(params->channels[i])))

		    (!(bssid_bitmap | s_ssid_bitmap) &&

		     !cfg80211_channel_is_psc(params->channels[i])))

			flags |= IWL_UHB_CHAN_CFG_FLAG_FORCE_PASSIVE;

		else

			flags |= bssid_bitmap | (s_ssid_bitmap << 16);



		channel_cfg[i].flags |= cpu_to_le32(flags);

	}