diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-03-29 10:05:31 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-03-30 13:08:42 +0300 |
| commit | 2152662d4e14610aaec84b8aba1266114ee78dd5 (patch) | |
| tree | f838c7122ba849b10a7899787e82c97b3827eb23 /drivers | |
| parent | 881d054896f700ca80b3bb2e5ad0b93631bf0113 (diff) | |
| download | linux-2152662d4e14610aaec84b8aba1266114ee78dd5.tar.xz | |
wifi: iwlwifi: mvm: clean up mac_id vs. link_id in MLD sta
Here we always have a link ID, not MAC ID, so clean up the
naming.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230329100040.3def62de34b5.I10c9cf5dbfd1fc1e9c9c7d6d4cefcf0c08f1f2da@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c index b3377b4d7924..4d713c78b508 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c @@ -21,8 +21,7 @@ static int iwl_mvm_mld_send_sta_cmd(struct iwl_mvm *mvm, */ static int iwl_mvm_mld_add_int_sta_to_fw(struct iwl_mvm *mvm, struct iwl_mvm_int_sta *sta, - const u8 *addr, - u16 mac_id) + const u8 *addr, int link_id) { struct iwl_mvm_sta_cfg_cmd cmd; @@ -31,7 +30,7 @@ static int iwl_mvm_mld_add_int_sta_to_fw(struct iwl_mvm *mvm, memset(&cmd, 0, sizeof(cmd)); cmd.sta_id = cpu_to_le32((u8)sta->sta_id); - cmd.link_id = cpu_to_le32(mac_id); + cmd.link_id = cpu_to_le32(link_id); cmd.station_type = cpu_to_le32(sta->type); @@ -94,7 +93,7 @@ static int iwl_mvm_add_aux_sta_to_fw(struct iwl_mvm *mvm, */ static int iwl_mvm_mld_add_int_sta_with_queue(struct iwl_mvm *mvm, struct iwl_mvm_int_sta *sta, - const u8 *addr, int mac_id, + const u8 *addr, int link_id, u16 *queue, u8 tid, unsigned int *_wdg_timeout) { @@ -106,9 +105,9 @@ static int iwl_mvm_mld_add_int_sta_with_queue(struct iwl_mvm *mvm, return -ENOSPC; if (sta->type == STATION_TYPE_AUX) - ret = iwl_mvm_add_aux_sta_to_fw(mvm, sta, mac_id); + ret = iwl_mvm_add_aux_sta_to_fw(mvm, sta, link_id); else - ret = iwl_mvm_mld_add_int_sta_to_fw(mvm, sta, addr, mac_id); + ret = iwl_mvm_mld_add_int_sta_to_fw(mvm, sta, addr, link_id); if (ret) return ret; @@ -135,7 +134,7 @@ static int iwl_mvm_mld_add_int_sta(struct iwl_mvm *mvm, struct iwl_mvm_int_sta *int_sta, u16 *queue, enum nl80211_iftype iftype, enum iwl_fw_sta_type sta_type, - int mac_id, const u8 *addr, u8 tid, + int link_id, const u8 *addr, u8 tid, unsigned int *wdg_timeout) { int ret; @@ -148,7 +147,7 @@ static int iwl_mvm_mld_add_int_sta(struct iwl_mvm *mvm, if (ret) return ret; - ret = iwl_mvm_mld_add_int_sta_with_queue(mvm, int_sta, addr, mac_id, + ret = iwl_mvm_mld_add_int_sta_with_queue(mvm, int_sta, addr, link_id, queue, tid, wdg_timeout); if (ret) { iwl_mvm_dealloc_int_sta(mvm, int_sta); @@ -254,8 +253,8 @@ int iwl_mvm_mld_add_aux_sta(struct iwl_mvm *mvm, u32 lmac_id) { lockdep_assert_held(&mvm->mutex); - /* In CDB NICs we need to specify which lmac to use for aux activity - * using the mac_id argument place to send lmac_id to the function + /* In CDB NICs we need to specify which lmac to use for aux activity; + * use the link_id argument place to send lmac_id to the function. */ return iwl_mvm_mld_add_int_sta(mvm, &mvm->aux_sta, &mvm->aux_queue, NL80211_IFTYPE_UNSPECIFIED, |