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

Commit a590ad41 authored by David Spinadel's avatar David Spinadel Committed by Johannes Berg
Browse files

iwlwifi: mvm: remove extra SSID from probe request 



Bits 1-21 in this channel type attributes are indication for which
SSID is going to be sent on this channel. Since the first SSID is
sent implicitly in the probe request, we don't need to toggle its
bit here.

Signed-off-by: default avatarDavid Spinadel <david.spinadel@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent fe04e837

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

+4 −2
Original line number Diff line number Diff line
@@ -153,7 +153,9 @@ static void iwl_mvm_scan_fill_ssids(struct iwl_scan_cmd *cmd, 
 * just to notify that this scan is active and not passive.

 * In order to notify the FW of the number of SSIDs we wish to scan (including

 * the zero-length one), we need to set the corresponding bits in chan->type,

 * one for each SSID, and set the active bit (first).

 * one for each SSID, and set the active bit (first). The first SSID is already

 * included in the probe template, so we need to set only req->n_ssids - 1 bits

 * in addition to the first bit.

 */

static u16 iwl_mvm_get_active_dwell(enum ieee80211_band band, int n_ssids)

{
@@ -179,7 +181,7 @@ static void iwl_mvm_scan_fill_channels(struct iwl_scan_cmd *cmd, 
	__le32 chan_type_value;



	if (req->n_ssids > 0)

		chan_type_value = cpu_to_le32(BIT(req->n_ssids + 1) - 1);

		chan_type_value = cpu_to_le32(BIT(req->n_ssids) - 1);

	else

		chan_type_value = SCAN_CHANNEL_TYPE_PASSIVE;