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

qcacmn: Replace WLAN_FEATURE_T2LM flag with WLAN_FEATURE_11BE

Browse Source 
Replace WLAN_FEATURE_T2LM compile-time flag with WLAN_FEATURE_11BE.

Change-Id: If3253bf3aae04f434252bfc92d00b8649f831bfe
CRs-Fixed: 3238444
This commit is contained in:
Shashikala Prabhu
2022-07-07 17:37:22 +05:30
committed by Madan Koyyalamudi
parent d298ea09cd
commit 79b3391de9
9 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h
View File

@@ -2435,7 +2435,7 @@ struct wlan_ml_prv_linfo_perstaprof {
#endif /* WLAN_FEATURE_11BE_MLO */ #endif /* WLAN_FEATURE_11BE_MLO */
#endif /* WLAN_FEATURE_11BE */ #endif /* WLAN_FEATURE_11BE */
#ifdef WLAN_FEATURE_T2LM #ifdef WLAN_FEATURE_11BE
/** /**
* struct wlan_ie_tid_to_link_mapping - TID-to-link mapping IE * struct wlan_ie_tid_to_link_mapping - TID-to-link mapping IE
* @elem_id: T2LM IE * @elem_id: T2LM IE
@@ -2488,7 +2488,7 @@ struct wlan_ie_multi_link_traffic_indication {
uint16_t ml_traffic_ind_control; uint16_t ml_traffic_ind_control;
uint16_t per_link_traffic_ind_list[]; uint16_t per_link_traffic_ind_list[];
} qdf_packed; } qdf_packed;
#endif /* WLAN_FEATURE_T2LM */ #endif /* WLAN_FEATURE_11BE */
/** /**
* struct he_oper_6g_param: 6 Ghz params for HE * struct he_oper_6g_param: 6 Ghz params for HE

8
umac/mlo_mgr/inc/wlan_mlo_mgr_public_structs.h
View File

@@ -383,7 +383,7 @@ struct mlpeer_auth_params {
void *rs; void *rs;
}; };
#ifdef WLAN_FEATURE_T2LM #ifdef WLAN_FEATURE_11BE
/** /**
* enum wlan_t2lm_direction - Indicates the direction for which TID-to-link * enum wlan_t2lm_direction - Indicates the direction for which TID-to-link
@@ -541,7 +541,7 @@ struct wlan_mlo_peer_t2lm_policy {
struct wlan_prev_t2lm_negotiated_info t2lm_negotiated_info; struct wlan_prev_t2lm_negotiated_info t2lm_negotiated_info;
struct wlan_t2lm_onging_negotiation_info ongoing_tid_to_link_mapping; struct wlan_t2lm_onging_negotiation_info ongoing_tid_to_link_mapping;
}; };
#endif /* WLAN_FEATURE_T2LM */ #endif /* WLAN_FEATURE_11BE */
/* /*
* struct wlan_mlo_peer_context - MLO peer context * struct wlan_mlo_peer_context - MLO peer context
@@ -590,7 +590,7 @@ struct wlan_mlo_peer_context {
#ifdef UMAC_MLO_AUTH_DEFER #ifdef UMAC_MLO_AUTH_DEFER
struct mlpeer_auth_params *pending_auth[MAX_MLO_LINK_PEERS]; struct mlpeer_auth_params *pending_auth[MAX_MLO_LINK_PEERS];
#endif #endif
#ifdef WLAN_FEATURE_T2LM #ifdef WLAN_FEATURE_11BE
struct wlan_mlo_peer_t2lm_policy t2lm_policy; struct wlan_mlo_peer_t2lm_policy t2lm_policy;
#endif #endif
}; };
@@ -622,7 +622,7 @@ struct mlo_link_info {
struct mlo_partner_info { struct mlo_partner_info {
uint8_t num_partner_links; uint8_t num_partner_links;
struct mlo_link_info partner_link_info[WLAN_UMAC_MLO_MAX_VDEVS]; struct mlo_link_info partner_link_info[WLAN_UMAC_MLO_MAX_VDEVS];
#ifdef WLAN_FEATURE_T2LM #ifdef WLAN_FEATURE_11BE
enum wlan_t2lm_enable t2lm_enable_val; enum wlan_t2lm_enable t2lm_enable_val;
#endif #endif
}; };

4
umac/mlo_mgr/src/wlan_mlo_mgr_aid.c
View File

@@ -167,7 +167,7 @@ static uint16_t wlan_mlo_alloc_aid(struct wlan_ml_vdev_aid_mgr *ml_aid_mgr,
return assoc_id; return assoc_id;
} }
#ifdef WLAN_FEATURE_T2LM #ifdef WLAN_FEATURE_11BE
#define AID_NUM_BUCKET 3 #define AID_NUM_BUCKET 3
static uint16_t _wlan_mlo_peer_alloc_aid( static uint16_t _wlan_mlo_peer_alloc_aid(
struct wlan_ml_vdev_aid_mgr *ml_aid_mgr, struct wlan_ml_vdev_aid_mgr *ml_aid_mgr,
@@ -533,7 +533,7 @@ uint16_t wlan_mlme_get_aid_count(struct wlan_objmgr_vdev *vdev)
return aid_count; return aid_count;
} }
#ifdef WLAN_FEATURE_T2LM #ifdef WLAN_FEATURE_11BE
static bool mlo_peer_t2lm_enabled(struct wlan_mlo_peer_context *ml_peer) static bool mlo_peer_t2lm_enabled(struct wlan_mlo_peer_context *ml_peer)
{ {
if (ml_peer->t2lm_policy.t2lm_enable_val > WLAN_T2LM_NOT_SUPPORTED && if (ml_peer->t2lm_policy.t2lm_enable_val > WLAN_T2LM_NOT_SUPPORTED &&

4
umac/mlo_mgr/src/wlan_mlo_mgr_peer.c
View File

@@ -736,7 +736,7 @@ static void mlo_dev_release_link_vdevs(
} }
} }
#ifdef WLAN_FEATURE_T2LM #ifdef WLAN_FEATURE_11BE
static void static void
wlan_mlo_peer_set_t2lm_enable_val(struct wlan_mlo_peer_context *ml_peer, wlan_mlo_peer_set_t2lm_enable_val(struct wlan_mlo_peer_context *ml_peer,
struct mlo_partner_info *ml_info) struct mlo_partner_info *ml_info)
@@ -748,7 +748,7 @@ static void
wlan_mlo_peer_set_t2lm_enable_val(struct wlan_mlo_peer_context *ml_peer, wlan_mlo_peer_set_t2lm_enable_val(struct wlan_mlo_peer_context *ml_peer,
struct mlo_partner_info *ml_info) struct mlo_partner_info *ml_info)
{} {}
#endif /* WLAN_FEATURE_T2LM */ #endif /* WLAN_FEATURE_11BE */
QDF_STATUS wlan_mlo_peer_create(struct wlan_objmgr_vdev *vdev, QDF_STATUS wlan_mlo_peer_create(struct wlan_objmgr_vdev *vdev,
struct wlan_objmgr_peer *link_peer, struct wlan_objmgr_peer *link_peer,

4
wmi/inc/wmi_unified_11be_api.h
View File

@@ -54,7 +54,7 @@ wmi_send_mlo_link_set_active_cmd(wmi_unified_t wmi_handle,
struct mlo_link_set_active_param *param); struct mlo_link_set_active_param *param);
#endif /*WLAN_FEATURE_11BE_MLO*/ #endif /*WLAN_FEATURE_11BE_MLO*/
#if defined(WLAN_FEATURE_11BE) && defined(WLAN_FEATURE_T2LM) #ifdef WLAN_FEATURE_11BE
/** /**
* wmi_send_mlo_peer_tid_to_link_map_cmd() - send TID-to-link mapping command * wmi_send_mlo_peer_tid_to_link_map_cmd() - send TID-to-link mapping command
* @wmi: WMI handle for this pdev * @wmi: WMI handle for this pdev
@@ -63,6 +63,6 @@ wmi_send_mlo_link_set_active_cmd(wmi_unified_t wmi_handle,
QDF_STATUS wmi_send_mlo_peer_tid_to_link_map_cmd( QDF_STATUS wmi_send_mlo_peer_tid_to_link_map_cmd(
wmi_unified_t wmi, wmi_unified_t wmi,
struct wmi_host_tid_to_link_map_params *params); struct wmi_host_tid_to_link_map_params *params);
#endif /* defined(WLAN_FEATURE_11BE) && defined(WLAN_FEATURE_T2LM) */ #endif /* WLAN_FEATURE_11BE */
#endif /*_WMI_UNIFIED_11BE_API_H_*/ #endif /*_WMI_UNIFIED_11BE_API_H_*/

6
wmi/inc/wmi_unified_param.h
View File

@@ -1080,7 +1080,7 @@ typedef struct {
uint32_t mac_addr47to32; uint32_t mac_addr47to32;
} wmi_host_mac_addr; } wmi_host_mac_addr;
#if defined(WLAN_FEATURE_11BE) && defined(WLAN_FEATURE_T2LM) #ifdef WLAN_FEATURE_11BE
/** /**
* struct wlan_host_t2lm_of_tids - TID-to-link mapping info * struct wlan_host_t2lm_of_tids - TID-to-link mapping info
* @direction: 0 - Downlink, 1 - uplink 2 - Both uplink and downlink * @direction: 0 - Downlink, 1 - uplink 2 - Both uplink and downlink
@@ -1108,7 +1108,7 @@ struct wmi_host_tid_to_link_map_params {
uint8_t num_dir; uint8_t num_dir;
struct wlan_host_t2lm_of_tids t2lm_info[WLAN_T2LM_MAX_DIRECTION]; struct wlan_host_t2lm_of_tids t2lm_info[WLAN_T2LM_MAX_DIRECTION];
}; };
#endif /* defined(WLAN_FEATURE_11BE) && defined(WLAN_FEATURE_T2LM) */ #endif /* WLAN_FEATURE_11BE */
#ifdef WLAN_FEATURE_11BE_MLO #ifdef WLAN_FEATURE_11BE_MLO
/** /**
@@ -1321,7 +1321,7 @@ struct peer_assoc_params {
#endif #endif
uint8_t peer_dms_capable:1, uint8_t peer_dms_capable:1,
reserved:7; reserved:7;
#if defined(WLAN_FEATURE_11BE) && defined(WLAN_FEATURE_T2LM) #ifdef WLAN_FEATURE_11BE
struct wmi_host_tid_to_link_map_params t2lm_params; struct wmi_host_tid_to_link_map_params t2lm_params;
#endif #endif
}; };

4
wmi/inc/wmi_unified_priv.h
View File

@@ -3032,11 +3032,11 @@ QDF_STATUS
(*send_vdev_pn_mgmt_rxfilter_cmd)(wmi_unified_t wmi_handle, (*send_vdev_pn_mgmt_rxfilter_cmd)(wmi_unified_t wmi_handle,
struct vdev_pn_mgmt_rxfilter_params *params); struct vdev_pn_mgmt_rxfilter_params *params);
#if defined(WLAN_FEATURE_11BE) && defined(WLAN_FEATURE_T2LM) #ifdef WLAN_FEATURE_11BE
QDF_STATUS (*send_mlo_peer_tid_to_link_map)( QDF_STATUS (*send_mlo_peer_tid_to_link_map)(
wmi_unified_t wmi_handle, wmi_unified_t wmi_handle,
struct wmi_host_tid_to_link_map_params *params); struct wmi_host_tid_to_link_map_params *params);
#endif /* defined(WLAN_FEATURE_11BE) && defined(WLAN_FEATURE_T2LM) */ #endif /* WLAN_FEATURE_11BE */
QDF_STATUS QDF_STATUS
(*extract_pktlog_decode_info_event)(wmi_unified_t wmi_handle, void *evt_buf, (*extract_pktlog_decode_info_event)(wmi_unified_t wmi_handle, void *evt_buf,

4
wmi/src/wmi_unified_11be_api.c
View File

@@ -59,7 +59,7 @@ wmi_send_mlo_link_set_active_cmd(wmi_unified_t wmi,
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
#if defined(WLAN_FEATURE_11BE) && defined(WLAN_FEATURE_T2LM) #ifdef WLAN_FEATURE_11BE
QDF_STATUS wmi_send_mlo_peer_tid_to_link_map_cmd( QDF_STATUS wmi_send_mlo_peer_tid_to_link_map_cmd(
wmi_unified_t wmi, wmi_unified_t wmi,
struct wmi_host_tid_to_link_map_params *params) struct wmi_host_tid_to_link_map_params *params)
@@ -69,4 +69,4 @@ QDF_STATUS wmi_send_mlo_peer_tid_to_link_map_cmd(
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
#endif /* defined(WLAN_FEATURE_11BE) && defined(WLAN_FEATURE_T2LM) */ #endif /* WLAN_FEATURE_11BE */

12
wmi/src/wmi_unified_11be_tlv.c
View File

@@ -554,7 +554,7 @@ extract_mlo_link_set_active_resp_tlv(wmi_unified_t wmi_handle, void *evt_buf,
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
#if defined(WLAN_FEATURE_11BE) && defined(WLAN_FEATURE_T2LM) #ifdef WLAN_FEATURE_11BE
size_t peer_assoc_t2lm_params_size(struct peer_assoc_params *req) size_t peer_assoc_t2lm_params_size(struct peer_assoc_params *req)
{ {
size_t peer_assoc_t2lm_size = WMI_TLV_HDR_SIZE + size_t peer_assoc_t2lm_size = WMI_TLV_HDR_SIZE +
@@ -564,7 +564,7 @@ size_t peer_assoc_t2lm_params_size(struct peer_assoc_params *req)
return peer_assoc_t2lm_size; return peer_assoc_t2lm_size;
} }
void peer_assoc_populate_t2lm_tlv(wmi_peer_assoc_tid_to_link_map *cmd, static void peer_assoc_populate_t2lm_tlv(wmi_peer_assoc_tid_to_link_map *cmd,
struct wlan_host_t2lm_of_tids *t2lm, struct wlan_host_t2lm_of_tids *t2lm,
uint8_t tid_num) uint8_t tid_num)
{ {
@@ -625,7 +625,7 @@ uint8_t *peer_assoc_add_tid_to_link_map(uint8_t *buf_ptr,
return buf_ptr; return buf_ptr;
} }
QDF_STATUS send_mlo_peer_tid_to_link_map_cmd_tlv( static QDF_STATUS send_mlo_peer_tid_to_link_map_cmd_tlv(
wmi_unified_t wmi_handle, wmi_unified_t wmi_handle,
struct wmi_host_tid_to_link_map_params *params) struct wmi_host_tid_to_link_map_params *params)
{ {
@@ -734,7 +734,7 @@ uint8_t *peer_assoc_add_tid_to_link_map(uint8_t *buf_ptr,
WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, 0); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, 0);
return buf_ptr + WMI_TLV_HDR_SIZE; return buf_ptr + WMI_TLV_HDR_SIZE;
} }
#endif /* defined(WLAN_FEATURE_11BE) && defined(WLAN_FEATURE_T2LM) */ #endif /* WLAN_FEATURE_11BE */
#ifdef WLAN_MLO_MULTI_CHIP #ifdef WLAN_MLO_MULTI_CHIP
QDF_STATUS mlo_setup_cmd_send_tlv(struct wmi_unified *wmi_handle, QDF_STATUS mlo_setup_cmd_send_tlv(struct wmi_unified *wmi_handle,
@@ -941,8 +941,8 @@ void wmi_11be_attach_tlv(wmi_unified_t wmi_handle)
extract_mlo_link_set_active_resp_tlv; extract_mlo_link_set_active_resp_tlv;
ops->send_mlo_link_set_active_cmd = ops->send_mlo_link_set_active_cmd =
send_mlo_link_set_active_cmd_tlv; send_mlo_link_set_active_cmd_tlv;
#if defined(WLAN_FEATURE_11BE) && defined(WLAN_FEATURE_T2LM) #ifdef WLAN_FEATURE_11BE
ops->send_mlo_peer_tid_to_link_map = ops->send_mlo_peer_tid_to_link_map =
send_mlo_peer_tid_to_link_map_cmd_tlv; send_mlo_peer_tid_to_link_map_cmd_tlv;
#endif /* defined(WLAN_FEATURE_11BE) && defined(WLAN_FEATURE_T2LM) */ #endif /* WLAN_FEATURE_11BE */
} }