Browse Source

qcacld-3.0: Remove the vhtTxChannelWidthSet parameter

vhtTxChannelWidthSet is redundant parameter for channel width
as phy_ch_width is used to represent the channel width. So remove
the redundant parameter

Change-Id: Ied9ef3dddfcb89bac8d49c5c0dd2f21b3d041567
CRs-Fixed: 1007367
Kiran Kumar Lokere 9 năm trước cách đây
mục cha
commit
27a7eabd94

+ 0 - 1
core/mac/inc/sir_api.h

@@ -682,7 +682,6 @@ typedef struct sSirSmeHTProfile {
 	uint8_t htRecommendedTxWidthSet;
 	ePhyChanBondState htSecondaryChannelOffset;
 	uint8_t vhtCapability;
-	uint8_t vhtTxChannelWidthSet;
 	uint8_t apCenterChan;
 	uint8_t apChanWidth;
 } tSirSmeHTProfile;

+ 0 - 1
core/mac/src/pe/include/lim_session.h

@@ -309,7 +309,6 @@ typedef struct sPESession       /* Added to Support BT-AMP */
 
 	tBeaconParams beaconParams;
 	uint8_t vhtCapability;
-	uint8_t vhtTxChannelWidthSet;
 	tLimOperatingModeInfo gLimOperatingMode;
 	uint8_t vhtCapabilityPresentInBeacon;
 	uint8_t ch_center_freq_seg0;

+ 0 - 2
core/mac/src/pe/lim/lim_api.c

@@ -1699,8 +1699,6 @@ void lim_fill_join_rsp_ht_caps(tpPESession session, tpSirSmeJoinRsp join_rsp)
 	ht_profile->dot11mode = session->dot11mode;
 	ht_profile->htCapability = session->htCapability;
 	ht_profile->vhtCapability = session->vhtCapability;
-	ht_profile->vhtTxChannelWidthSet =
-		session->vhtTxChannelWidthSet;
 	ht_profile->apCenterChan = session->ch_center_freq_seg0;
 	ht_profile->apChanWidth = session->ch_width;
 }

+ 0 - 2
core/mac/src/pe/lim/lim_prop_exts_utils.c

@@ -123,8 +123,6 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie,
 			beacon_struct->VHTOperation.present &&
 			session->vhtCapability) {
 			session->vhtCapabilityPresentInBeacon = 1;
-			session->vhtTxChannelWidthSet =
-				beacon_struct->VHTOperation.chanWidth;
 			if (((beacon_struct->Vendor1IEPresent &&
 				beacon_struct->vendor2_ie.present &&
 				beacon_struct->Vendor3IEPresent)) &&

+ 0 - 4
core/mac/src/pe/lim/lim_send_sme_rsp_messages.c

@@ -353,8 +353,6 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
 			ht_profile->htCapability = session_entry->htCapability;
 			ht_profile->vhtCapability =
 				session_entry->vhtCapability;
-			ht_profile->vhtTxChannelWidthSet =
-				session_entry->vhtTxChannelWidthSet;
 			ht_profile->apCenterChan = session_entry->ch_center_freq_seg0;
 			ht_profile->apChanWidth = session_entry->ch_width;
 		}
@@ -648,8 +646,6 @@ lim_send_sme_start_bss_rsp(tpAniSirGlobal pMac,
 					psessionEntry->htCapability;
 				pSirSmeRsp->HTProfile.vhtCapability =
 					psessionEntry->vhtCapability;
-				pSirSmeRsp->HTProfile.vhtTxChannelWidthSet =
-					psessionEntry->vhtTxChannelWidthSet;
 				pSirSmeRsp->HTProfile.apCenterChan =
 					psessionEntry->ch_center_freq_seg0;
 				pSirSmeRsp->HTProfile.apChanWidth =

+ 1 - 1
core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -304,7 +304,7 @@ populate_dot11_supp_operating_classes(tpAniSirGlobal mac_ptr,
 {
 	uint8_t ch_bandwidth;
 
-	if (session_entry->vhtTxChannelWidthSet == eHT_CHANNEL_WIDTH_80MHZ) {
+	if (session_entry->ch_width == CH_WIDTH_80MHZ) {
 		ch_bandwidth = BW80;
 	} else {
 		switch (session_entry->htSecondaryChannelOffset) {

+ 0 - 1
core/sme/inc/csr_api.h

@@ -939,7 +939,6 @@ typedef struct tagCsrRoamHTProfile {
 	uint8_t htRecommendedTxWidthSet;
 	ePhyChanBondState htSecondaryChannelOffset;
 	uint8_t vhtCapability;
-	uint8_t vhtTxChannelWidthSet;
 	uint8_t apCenterChan;
 	uint8_t apChanWidth;
 } tCsrRoamHTProfile;

+ 0 - 1
core/sme/src/csr/csr_api_roam.c

@@ -5946,7 +5946,6 @@ static void csr_roam_copy_ht_profile(tCsrRoamHTProfile *dst_profile,
 	dst_profile->htSecondaryChannelOffset =
 		src_profile->htSecondaryChannelOffset;
 	dst_profile->vhtCapability = src_profile->vhtCapability;
-	dst_profile->vhtTxChannelWidthSet = src_profile->vhtTxChannelWidthSet;
 	dst_profile->apCenterChan = src_profile->apCenterChan;
 	dst_profile->apChanWidth = src_profile->apChanWidth;
 }