samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: change parameter name 'is_assoc_link' in cdp_peer_setup_info

Browse Source 
Currently is_assoc_link flag in cdp_peer_setup_info just means first
link peer during MLO connection, but usually assoc_link is the
link which initialize MLO association and it will be the primary_link.
this introduce confusion with another flag is_primary_link.

Change it to 'is_first_link' in cdp_peer_setup_info

Change-Id: I8d14da73e6a3bbc39a4a527d6c0aa5667255e995
CRs-Fixed: 3090270
This commit is contained in:
Jinwei Chen
2021-12-07 22:51:17 -08:00
committed by Madan Koyyalamudi
parent 2cb0e9b21e
commit 96a3c195c2
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dp/inc/cdp_txrx_cmn_struct.h
View File

@@ -411,14 +411,13 @@ enum cdp_peer_type {
/** /**
* struct cdp_peer_setup_info: MLO connection info for cdp_peer_setup() * struct cdp_peer_setup_info: MLO connection info for cdp_peer_setup()
* @mld_peer_mac: mld peer mac address pointer * @mld_peer_mac: mld peer mac address pointer
* @is_assoc_link: set true for first MLO link peer association * @is_first_link: set true for first MLO link peer
* @is_primary_link: for MCC, the first link will always be primary link, * @is_primary_link: set true for MLO primary link peer
* for WIN, other link might be primary link.
* @primary_umac_id: primary umac_id * @primary_umac_id: primary umac_id
*/ */
struct cdp_peer_setup_info { struct cdp_peer_setup_info {
uint8_t *mld_peer_mac; uint8_t *mld_peer_mac;
uint8_t is_assoc_link:1, uint8_t is_first_link:1,
is_primary_link:1; is_primary_link:1;
uint8_t primary_umac_id; uint8_t primary_umac_id;
}; };

10
dp/wifi3.0/dp_main.c
View File

@@ -6918,21 +6918,21 @@ QDF_STATUS dp_peer_mlo_setup(
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
/* if this is the first assoc link */ /* if this is the first link peer */
if (setup_info->is_assoc_link) if (setup_info->is_first_link)
/* create MLD peer */ /* create MLD peer */
dp_peer_create_wifi3((struct cdp_soc_t *)soc, dp_peer_create_wifi3((struct cdp_soc_t *)soc,
vdev_id, vdev_id,
setup_info->mld_peer_mac, setup_info->mld_peer_mac,
CDP_MLD_PEER_TYPE); CDP_MLD_PEER_TYPE);
peer->assoc_link = setup_info->is_assoc_link; peer->first_link = setup_info->is_first_link;
peer->primary_link = setup_info->is_primary_link; peer->primary_link = setup_info->is_primary_link;
mld_peer = dp_peer_find_hash_find(soc, mld_peer = dp_peer_find_hash_find(soc,
setup_info->mld_peer_mac, setup_info->mld_peer_mac,
0, DP_VDEV_ALL, DP_MOD_ID_CDP); 0, DP_VDEV_ALL, DP_MOD_ID_CDP);
if (mld_peer) { if (mld_peer) {
if (setup_info->is_assoc_link) { if (setup_info->is_first_link) {
/* assign rx_tid to mld peer */ /* assign rx_tid to mld peer */
mld_peer->rx_tid = peer->rx_tid; mld_peer->rx_tid = peer->rx_tid;
/* no cdp_peer_setup for MLD peer, /* no cdp_peer_setup for MLD peer,
@@ -6947,7 +6947,7 @@ QDF_STATUS dp_peer_mlo_setup(
} }
if (setup_info->is_primary_link && if (setup_info->is_primary_link &&
!setup_info->is_assoc_link) { !setup_info->is_first_link) {
/* /*
* if first link is not the primary link, * if first link is not the primary link,
* then need to change mld_peer->vdev as * then need to change mld_peer->vdev as

8
dp/wifi3.0/dp_peer.c
View File

@@ -2853,7 +2853,7 @@ static bool dp_get_peer_vdev_roaming_in_progress(struct dp_peer *peer)
static inline static inline
bool dp_rx_tid_setup_allow(struct dp_peer *peer) bool dp_rx_tid_setup_allow(struct dp_peer *peer)
{ {
if (IS_MLO_DP_LINK_PEER(peer) && !peer->assoc_link) if (IS_MLO_DP_LINK_PEER(peer) && !peer->first_link)
return false; return false;
return true; return true;
@@ -3712,7 +3712,7 @@ static void dp_peer_rx_tids_init(struct dp_peer *peer)
/* if not first assoc link peer or MLD peer, /* if not first assoc link peer or MLD peer,
* not to initialize rx_tids again. * not to initialize rx_tids again.
*/ */
if ((IS_MLO_DP_LINK_PEER(peer) && !peer->assoc_link) || if ((IS_MLO_DP_LINK_PEER(peer) && !peer->first_link) ||
IS_MLO_DP_MLD_PEER(peer)) IS_MLO_DP_MLD_PEER(peer))
return; return;
@@ -4745,7 +4745,7 @@ QDF_STATUS dp_register_peer(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
if (!IS_MLO_DP_LINK_PEER(peer)) if (!IS_MLO_DP_LINK_PEER(peer))
dp_rx_flush_rx_cached(peer, false); dp_rx_flush_rx_cached(peer, false);
if (IS_MLO_DP_LINK_PEER(peer) && peer->assoc_link) { if (IS_MLO_DP_LINK_PEER(peer) && peer->first_link) {
dp_peer_info("register for mld peer" QDF_MAC_ADDR_FMT, dp_peer_info("register for mld peer" QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer->mld_peer->mac_addr.raw)); QDF_MAC_ADDR_REF(peer->mld_peer->mac_addr.raw));
qdf_spin_lock_bh(&peer->mld_peer->peer_info_lock); qdf_spin_lock_bh(&peer->mld_peer->peer_info_lock);
@@ -4779,7 +4779,7 @@ QDF_STATUS dp_peer_state_update(struct cdp_soc_t *soc_hdl, uint8_t *peer_mac,
QDF_MAC_ADDR_REF(peer->mac_addr.raw), QDF_MAC_ADDR_REF(peer->mac_addr.raw),
peer->state); peer->state);
if (IS_MLO_DP_LINK_PEER(peer) && peer->assoc_link) { if (IS_MLO_DP_LINK_PEER(peer) && peer->first_link) {
peer->mld_peer->state = peer->state; peer->mld_peer->state = peer->state;
peer->mld_peer->authorize = peer->authorize; peer->mld_peer->authorize = peer->authorize;
dp_peer_info("mld peer" QDF_MAC_ADDR_FMT "state %d", dp_peer_info("mld peer" QDF_MAC_ADDR_FMT "state %d",

2
dp/wifi3.0/dp_types.h
View File

@@ -3337,7 +3337,7 @@ struct dp_peer {
hw_txrx_stats_en:1; /*Indicate HW offload vdev stats */ hw_txrx_stats_en:1; /*Indicate HW offload vdev stats */
#ifdef WLAN_FEATURE_11BE_MLO #ifdef WLAN_FEATURE_11BE_MLO
uint8_t assoc_link:1, /* first assoc link peer for MLO */ uint8_t first_link:1, /* first link peer for MLO */
primary_link:1; /* primary link for MLO */ primary_link:1; /* primary link for MLO */
#endif #endif