The hw_link_id field of ath12k_dp_link_peer holds the driver link id of the link peer. This is the hw_link_id for QCN9274, but for WCN7850/QCC2072 it is the logical_link_id instead. The hw_link_id name is therefore misleading for the latter. Rename it to drv_link_id to reflect that it is the driver link id regardless of how the underlying value is derived. No functional change intended. Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3 Tested-on: QCC2072 hw1.0 PCI WLAN.COL.1.0.c2-00068-QCACOLSWPL_V1_TO_SILICONZ-1 Signed-off-by: Baochen Qiang --- drivers/net/wireless/ath/ath12k/dp_peer.c | 10 +++++----- drivers/net/wireless/ath/ath12k/dp_peer.h | 7 ++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/dp_peer.c b/drivers/net/wireless/ath/ath12k/dp_peer.c index 2826d6016ce8..f73dad49e42b 100644 --- a/drivers/net/wireless/ath/ath12k/dp_peer.c +++ b/drivers/net/wireless/ath/ath12k/dp_peer.c @@ -544,9 +544,9 @@ int ath12k_dp_link_peer_assign(struct ath12k_dp *dp, struct ath12k_dp_hw *dp_hw, dp_peer->peer_id = peer->peer_id; peer->dp_peer = dp_peer; - peer->hw_link_id = hw_link_id; + peer->drv_link_id = hw_link_id; - dp_peer->link_id_map[peer->hw_link_id] = link_id; + dp_peer->link_id_map[peer->drv_link_id] = link_id; peerid_index = ath12k_dp_peer_get_peerid_index(dp, peer->peer_id); @@ -566,7 +566,7 @@ int ath12k_dp_link_peer_assign(struct ath12k_dp *dp, struct ath12k_dp_hw *dp_hw, * already present */ temp_peer = ath12k_dp_link_peer_find_by_addr(dp, addr); - if (temp_peer && temp_peer->hw_link_id != hw_link_id) + if (temp_peer && temp_peer->drv_link_id != hw_link_id) ath12k_dp_link_peer_rhash_delete(dp, temp_peer); ret = ath12k_dp_link_peer_rhash_add(dp, peer); @@ -614,7 +614,7 @@ void ath12k_dp_link_peer_unassign(struct ath12k_dp *dp, struct ath12k_dp_hw *dp_ spin_lock_bh(&dp_hw->peer_lock); dp_peer = peer->dp_peer; - dp_peer->link_id_map[peer->hw_link_id] = 0; + dp_peer->link_id_map[peer->drv_link_id] = 0; peerid_index = ath12k_dp_peer_get_peerid_index(dp, peer->peer_id); @@ -629,7 +629,7 @@ void ath12k_dp_link_peer_unassign(struct ath12k_dp *dp, struct ath12k_dp_hw *dp_ if (dp->hw_params->support_hw_link_id) { /* To handle roaming and split phy scenario */ temp_peer = ath12k_dp_link_peer_find_by_addr(dp, addr); - if (temp_peer && temp_peer->hw_link_id == hw_link_id) + if (temp_peer && temp_peer->drv_link_id == hw_link_id) ath12k_dp_link_peer_rhash_delete(dp, peer); } else { ath12k_dp_link_peer_rhash_delete(dp, peer); diff --git a/drivers/net/wireless/ath/ath12k/dp_peer.h b/drivers/net/wireless/ath/ath12k/dp_peer.h index b9c94d6366fa..d2752b35ba0f 100644 --- a/drivers/net/wireless/ath/ath12k/dp_peer.h +++ b/drivers/net/wireless/ath/ath12k/dp_peer.h @@ -99,7 +99,12 @@ struct ath12k_dp_link_peer { /* peer addr based rhashtable list pointer */ struct rhash_head rhash_addr; - u8 hw_link_id; + /* + * Driver link id of this link peer. It is the hw_link_id for + * QCN9274 and the logical_link_id for WCN7850/QCC2072. Only one + * of them is used at a time. + */ + u8 drv_link_id; u32 rx_tid_active_bitmask; /* link stats */ -- 2.25.1