Skip to content

Commit eaa06c9

Browse files
AyalaBkrgregkh
authored andcommitted
wifi: iwlwifi: mvm: properly set 6 GHz channel direct probe option
[ Upstream commit 989830d ] Ensure that the 6 GHz channel is configured with a valid direct BSSID, avoiding any invalid or multicast BSSID addresses. Signed-off-by: Ayala Beker <ayala.beker@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com> Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Link: https://msgid.link/20240513132416.91a631a0fe60.I2ea2616af9b8a2eaf959b156c69cf65a2f1204d4@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 36d6128 commit eaa06c9

File tree

1 file changed

+4
-1
lines changed
  • drivers/net/wireless/intel/iwlwifi/mvm

1 file changed

+4
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1721,7 +1721,10 @@ iwl_mvm_umac_scan_fill_6g_chan_list(struct iwl_mvm *mvm,
17211721
break;
17221722
}
17231723

1724-
if (k == idex_b && idex_b < SCAN_BSSID_MAX_SIZE) {
1724+
if (k == idex_b && idex_b < SCAN_BSSID_MAX_SIZE &&
1725+
!WARN_ONCE(!is_valid_ether_addr(scan_6ghz_params[j].bssid),
1726+
"scan: invalid BSSID at index %u, index_b=%u\n",
1727+
j, idex_b)) {
17251728
memcpy(&pp->bssid_array[idex_b++],
17261729
scan_6ghz_params[j].bssid, ETH_ALEN);
17271730
}

0 commit comments

Comments
 (0)