Преглед на файлове

qcacld-3.0: Fix undeclared identifier STA_ENTRY_TDLS_PEER

STA_ENTRY_TDLS_PEER is defined under feature flag FEATURE_WLAN_TDLS.
With FEATURE_WLAN_TDLS=n, compiler throws use of undeclared identifier
'STA_ENTRY_TDLS_PEER'.

Hence fix the error in wma_he.c:1276 introduced in change
I16073a51a8949093872f7a421e0ad01648b63e92.

Change-Id: I0038dad70147b5c4ded2abad34baf50c8bc32f83
CRs-Fixed: 3275175
Jia Ding преди 2 години
родител
ревизия
2d267a9f31
променени са 3 файла, в които са добавени 4 реда и са изтрити 7 реда
  1. 0 6
      core/mac/src/pe/lim/lim_assoc_utils.c
  2. 3 0
      core/wma/inc/wma_if.h
  3. 1 1
      core/wma/src/wma_he.c

+ 0 - 6
core/mac/src/pe/lim/lim_assoc_utils.c

@@ -61,12 +61,6 @@
 #include <cdp_txrx_cmn.h>
 #include <lim_mlo.h>
 
-#ifdef FEATURE_WLAN_TDLS
-#define IS_TDLS_PEER(type)  ((type) == STA_ENTRY_TDLS_PEER)
-#else
-#define IS_TDLS_PEER(type) 0
-#endif
-
 /**
  * lim_cmp_ssid() - utility function to compare SSIDs
  * @rx_ssid: Received SSID

+ 3 - 0
core/wma/inc/wma_if.h

@@ -59,6 +59,9 @@
 #define STA_ENTRY_PEER              STA_ENTRY_OTHER
 #ifdef FEATURE_WLAN_TDLS
 #define STA_ENTRY_TDLS_PEER         4
+#define IS_TDLS_PEER(type) ((type) == STA_ENTRY_TDLS_PEER)
+#else /* !FEATURE_WLAN_TDLS */
+#define IS_TDLS_PEER(type) false
 #endif /* FEATURE_WLAN_TDLS */
 #define STA_ENTRY_NDI_PEER          5
 

+ 1 - 1
core/wma/src/wma_he.c

@@ -1273,7 +1273,7 @@ void wma_populate_peer_he_cap(struct peer_assoc_params *peer,
 	}
 
 	if (params->ch_width > CH_WIDTH_80MHZ ||
-	    params->staType == STA_ENTRY_TDLS_PEER) {
+	    IS_TDLS_PEER(params->staType)) {
 		peer->peer_he_mcs_count = WMI_HOST_MAX_HE_RATE_SET;
 		peer->peer_he_rx_mcs_set[1] |=
 			params->supportedRates.rx_he_mcs_map_160;