mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 23:27:06 +00:00
Code Issues Releases Wiki Activity

wifi: iwlmei: don't send nic info with invalid mac address

Browse source 
In case the SAP connection is established before the interface is
added, the mac address is still not set. Don't send the nic info
SAP message in this case since it will result in sending an invalid
mac address. The nic info message will be sent with a valid mac
address when the interface is added.

Signed-off-by: Avraham Stern <avraham.stern@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230822103048.a49436bed387.I0ca88d72456e6e9f939bbc2e0c52ffb173fbc97e@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Avraham Stern 2023-08-22 10:33:19 +03:00 committed by Johannes Berg
parent a7d9ac48a6
commit 6d2c360b4b
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/wireless/intel/iwlwifi/mei/main.c
View file

@ -774,9 +774,13 @@ static void iwl_mei_set_init_conf(struct iwl_mei *mei)
iwl_mei_send_sap_msg_payload(mei->cldev, &sar_msg.hdr);
}
ether_addr_copy(nic_info_msg.mac_address, iwl_mei_cache.mac_address);
ether_addr_copy(nic_info_msg.nvm_address, iwl_mei_cache.nvm_address);
iwl_mei_send_sap_msg_payload(mei->cldev, &nic_info_msg.hdr);
if (is_valid_ether_addr(iwl_mei_cache.mac_address)) {
ether_addr_copy(nic_info_msg.mac_address,
iwl_mei_cache.mac_address);
ether_addr_copy(nic_info_msg.nvm_address,
iwl_mei_cache.nvm_address);
iwl_mei_send_sap_msg_payload(mei->cldev, &nic_info_msg.hdr);
}
iwl_mei_send_sap_msg_payload(mei->cldev, &rfkill_msg.hdr);
}