From: Johannes Berg Date: Wed, 29 Mar 2023 07:05:10 +0000 (+0300) Subject: wifi: iwlwifi: mvm: use STA link address X-Git-Tag: v6.4-rc1~132^2~151^2~31 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7e39d565fe1d32c6d8253340d577cc53fad03d8;p=thirdparty%2Fkernel%2Flinux.git wifi: iwlwifi: mvm: use STA link address For now we only support a single link, so just use the deflink's address for the link address, instead of the STA's (MLD) address, but use the link address anyway in order to facilitate MLO connections. Signed-off-by: Johannes Berg Signed-off-by: Gregory Greenman Link: https://lore.kernel.org/r/20230329100039.c853c8ced3ba.I2e1915d1090c526e6a4c718440b45a7192bbbb03@changeid Signed-off-by: Johannes Berg --- diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c index 7a01295949fa1..da9d2cefa509d 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c @@ -398,9 +398,9 @@ static int iwl_mvm_mld_cfg_sta(struct iwl_mvm *mvm, struct ieee80211_sta *sta, cmd.link_id = cpu_to_le32(link_info->fw_link_id); - /* For now the link addr is the same as the mld addr */ memcpy(&cmd.peer_mld_address, sta->addr, ETH_ALEN); - memcpy(&cmd.peer_link_address, sta->addr, ETH_ALEN); + /* FIXME: use the correct link */ + memcpy(&cmd.peer_link_address, sta->deflink.addr, ETH_ALEN); if (mvm_sta->sta_state >= IEEE80211_STA_ASSOC) cmd.assoc_id = cpu_to_le32(sta->aid);