From 43ee7eea10a65db4c3ae2c0514eed809e644e6d6 Mon Sep 17 00:00:00 2001 From: Tang Yingying Date: Tue, 17 Jan 2017 23:57:12 +0800 Subject: [PATCH] qcacld-3.0: Move WLAN_FEATURE_LINK_LAYER_STATS out of FEATURE_WLAN_TDLS WLAN_FEATURE_LINK_LAYER_STATS is included in FEATURE_WLAN_TDLS in wlan_hdd_cfg80211.h. It will lead cmpilation error when FEATURE_WLAN_TDLS is disabled.Since WLAN_FEATURE_LINK_LAYER_STATS doesn't depend on FEATURE_WLAN_TDLS, move WLAN_FEATURE_LINK_LAYER_STATS out of FEATURE_WLAN_TDLS to resolve this issue. Change-Id: I14f4b69a9868fcef7bf2aa9813ef562ad265acd9 CRs-Fixed: 1112463 --- core/hdd/src/wlan_hdd_cfg80211.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h index 42f1023ccefd..c447e8b5dc69 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.h +++ b/core/hdd/src/wlan_hdd_cfg80211.h @@ -124,14 +124,15 @@ typedef struct { #if !defined (TDLS_MGMT_VERSION2) #define TDLS_MGMT_VERSION2 0 #endif + +#endif + #ifdef WLAN_FEATURE_LINK_LAYER_STATS void wlan_hdd_clear_link_layer_stats(hdd_adapter_t *adapter); #else static inline void wlan_hdd_clear_link_layer_stats(hdd_adapter_t *adapter) {} #endif -#endif - #define MAX_CHANNEL (NUM_24GHZ_CHANNELS + NUM_5GHZ_CHANNELS) #define MAX_SCAN_SSID 10