wlan: Remove unused code TL under FEATURE_WLAN_TDLS_INTERNAL flag.
The code under flag FEATURE_WLAN_TDLS_INTERNAL does implement
the TDLS without the interactions to the supplicant, which is
not the option chosen.Hence removing the code which is unused.
CRs-Fixed: 838241
Change-Id: I2e1f6c7667bbab0f7fc73be01ccaccf225a152b9
diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c
index cb57a59..18648f3 100644
--- a/CORE/TL/src/wlan_qct_tl.c
+++ b/CORE/TL/src/wlan_qct_tl.c
@@ -346,25 +346,6 @@
v_U16_t * usEtherType
);
-#ifdef FEATURE_WLAN_TDLS_INTERNAL
-/* FIXME_MUST: during TDLS integration to main/latest, WLANTL_GetEtherType() conflicts.
-But there is difference. existing WLANTL_GetEtherType() expects vosDataBuff->offset points to MPDU Header,
-wherease TDLS expect vosDataBuff->offset should still points to RxBd.
-So far, data frmae stripped RxBD and passed to data frame handler.
-(RxBd should not be stripped in case TDLS, because it will be eventually routed to mgmt packet
-handler, where RX BD should be preserved)
-To avoid breaking existing functionality, for now, I temporarily rename to
-WLANTL_GetEtherType_2(). Eventually this function should be removed and merged to WLANTL_GetEtherType()
-*/
-static VOS_STATUS
-WLANTL_GetEtherType_2
-(
- v_U8_t * aucBDHeader,
- vos_pkt_t * vosDataBuff,
- v_U8_t ucMPDUHLen,
- v_U16_t * usEtherType
-);
-#endif
#ifdef FEATURE_WLAN_WAPI
/*---------------------------------------------------------------------------
* Adding a global variable to be used when doing frame translation in TxAuth
@@ -5720,10 +5701,6 @@
static v_U8_t first_data_pkt_arrived;
v_U32_t uDPUSig;
v_U16_t usPktLen;
-#ifdef FEATURE_WLAN_TDLS_INTERNAL
- v_U8_t ucMPDUHLen = 0 ;
- v_U16_t usEtherType = 0;
-#endif
v_BOOL_t bForwardIAPPwithLLC = VOS_FALSE;
#ifdef WLAN_FEATURE_LINK_LAYER_STATS
v_S7_t currentAvgRSSI = 0;
@@ -5830,24 +5807,13 @@
continue;
}
-#ifdef FEATURE_WLAN_TDLS_INTERNAL
- if ( WLANTL_IS_DATA_FRAME(ucFrmType))
- {
- ucMPDUHLen = (v_U8_t)WDA_GET_RX_MPDU_HEADER_LEN(pvBDHeader);
- WLANTL_GetEtherType_2(pvBDHeader, vosTempBuff, ucMPDUHLen, &usEtherType) ;
- }
-#endif
vos_pkt_get_packet_length(vosTempBuff, &usPktLen);
/*---------------------------------------------------------------------
Check if management and send to PE
---------------------------------------------------------------------*/
- if ( WLANTL_IS_MGMT_FRAME(ucFrmType)
-#ifdef FEATURE_WLAN_TDLS_INTERNAL
- || (WLANTL_IS_TDLS_FRAME(usEtherType))
-#endif
- )
+ if ( WLANTL_IS_MGMT_FRAME(ucFrmType))
{
TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH,
"WLAN TL:Sending packet to management client"));
@@ -12762,83 +12728,6 @@
return vosStatus;
}
-#ifdef FEATURE_WLAN_TDLS_INTERNAL
-/*==========================================================================
- FUNCTION WLANTL_GetEtherType_2
-
- DESCRIPTION Extract Ether type information from the BD
-
- DEPENDENCIES NONE
-
- PARAMETERS in aucBDHeader - BD header
- in vosDataBuff - data buffer
- in ucMPDUHLen - MPDU header length
- out pUsEtherType - pointer to Ethertype
-
- RETURN VALUE VOS_STATUS_SUCCESS : if the EtherType is successfully extracted
- VOS_STATUS_FAILURE : if the EtherType extraction failed and
- the packet was dropped
-
- SIDE EFFECTS NONE
-
-============================================================================*/
-static VOS_STATUS WLANTL_GetEtherType_2
-(
- v_U8_t * aucBDHeader,
- vos_pkt_t * vosDataBuff,
- v_U8_t ucMPDUHLen,
- v_U16_t * pUsEtherType
-)
-{
- v_U8_t ucOffset;
- v_U16_t usEtherType = *pUsEtherType;
- v_SIZE_t usLLCSize = sizeof(usEtherType);
- VOS_STATUS vosStatus = VOS_STATUS_SUCCESS;
- //v_U8_t ucLLCHeader;
- v_U8_t ucMPDUHOffset ;
- /*------------------------------------------------------------------------
- Check if LLC is present - if not, TL is unable to determine type
- ------------------------------------------------------------------------*/
- //ucMPDUHOffset = (v_U8_t)WLANHAL_RX_BD_GET_MPDU_H_OFFSET(aucBDHeader) ;
- //ucLLCHeader = (v_U8_t)WLANHAL_RX_BD_GET_LLC(aucBDHeader);
- ucMPDUHOffset = (v_U8_t)WDA_GET_RX_MPDU_HEADER_OFFSET(aucBDHeader);
-
- if ( VOS_TRUE == WDA_IS_RX_LLC_PRESENT(aucBDHeader) )
- {
- ucOffset = ucMPDUHOffset + WLANTL_802_3_HEADER_LEN - sizeof(usEtherType);
- }
- else
- {
- ucOffset = WLANHAL_RX_BD_HEADER_SIZE + ucMPDUHLen
- + WLANTL_LLC_PROTO_TYPE_OFFSET;
- }
-
- /*------------------------------------------------------------------------
- Extract LLC type
- ------------------------------------------------------------------------*/
- vosStatus = vos_pkt_extract_data( vosDataBuff, ucOffset,
- (v_PVOID_t)&usEtherType, &usLLCSize);
-
- /* TODO: Do it in better way */
- if(vos_be16_to_cpu(usEtherType) == 0x890d)
- {
- VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- ("TDLS frame llc %x"), vos_be16_to_cpu(usEtherType)) ;
- }
-
- VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH,
- "WLAN TL:Ether type retrieved before endianess conv: %d",
- usEtherType);
-
- usEtherType = vos_be16_to_cpu(usEtherType);
- *pUsEtherType = usEtherType;
-
- VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH,
- "WLAN TL:Ether type retrieved: %d", usEtherType);
-
- return vosStatus;
-}
-#endif /* FEATURE_WLAN_TDLS */
/*===============================================================================
FUNCTION WLANTL_IsReplayPacket