wifi: iwlwifi: mvm: properly set 6 GHz channel direct probe option

[ Upstream commit 989830d1cf16bd149bf0690d889a9caef95fb5b1 ]

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>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 525d8efcc147592d77ca8fa32ce208587b2e5183..e8d40e4a2f2ff729e65af48c4d9e148afd48f48a 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -1717,7 +1717,10 @@ iwl_mvm_umac_scan_fill_6g_chan_list(struct iwl_mvm *mvm,
                                break;
                }
 
-               if (k == idex_b && idex_b < SCAN_BSSID_MAX_SIZE) {
+               if (k == idex_b && idex_b < SCAN_BSSID_MAX_SIZE &&
+                   !WARN_ONCE(!is_valid_ether_addr(scan_6ghz_params[j].bssid),
+                              "scan: invalid BSSID at index %u, index_b=%u\n",
+                              j, idex_b)) {
                        memcpy(&pp->bssid_array[idex_b++],
                               scan_6ghz_params[j].bssid, ETH_ALEN);
                }