From bf65e5a126b3af8bd08c9d0102c2e71ecebd905e Mon Sep 17 00:00:00 2001 From: Ajit Pal Singh Date: Tue, 9 May 2017 16:03:15 +0530 Subject: [PATCH] qcacld-3.0: Always enable AVOID_FREQUENCIES NL event Since AVOID_FREQUENCIES event might be needed even when FEATURE_WLAN_CH_AVOID is disabled, always enable QCA_NL80211_VENDOR_SUBCMD_AVOID_FREQUENCY_INDEX in the cfg80211 event list. Also function wlan_hdd_send_avoid_freq_event() which is used to send AVOID_FREQUENCIES event to user-space is always compiled in. Change-Id: Ied011c309b38fa43e847eb125728e681df4ceca4 CRs-Fixed: 2045120 --- core/hdd/src/wlan_hdd_cfg80211.c | 4 ---- core/hdd/src/wlan_hdd_cfg80211.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index f8e3ba74b3df..9dc6a6331bf2 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -761,7 +761,6 @@ wlan_hdd_cfg80211_get_tdls_capabilities(struct wiphy *wiphy, static void wlan_hdd_cfg80211_start_pending_acs(struct work_struct *work); #endif -#if defined(FEATURE_WLAN_CH_AVOID) || defined(FEATURE_WLAN_FORCE_SAP_SCC) /* * FUNCTION: wlan_hdd_send_avoid_freq_event * This is called when wlan driver needs to send vendor specific @@ -802,18 +801,15 @@ int wlan_hdd_send_avoid_freq_event(hdd_context_t *pHddCtx, EXIT(); return 0; } -#endif /* FEATURE_WLAN_CH_AVOID || FEATURE_WLAN_FORCE_SAP_SCC */ /* vendor specific events */ static const struct nl80211_vendor_cmd_info wlan_hdd_cfg80211_vendor_events[] = { -#ifdef FEATURE_WLAN_CH_AVOID [QCA_NL80211_VENDOR_SUBCMD_AVOID_FREQUENCY_INDEX] = { .vendor_id = QCA_NL80211_VENDOR_ID, .subcmd = QCA_NL80211_VENDOR_SUBCMD_AVOID_FREQUENCY }, -#endif /* FEATURE_WLAN_CH_AVOID */ #ifdef WLAN_FEATURE_NAN [QCA_NL80211_VENDOR_SUBCMD_NAN_INDEX] = { diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h index 8dcc734c3752..1947bbf2a338 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.h +++ b/core/hdd/src/wlan_hdd_cfg80211.h @@ -167,7 +167,6 @@ typedef enum { #define WIFI_TDLS_EXTERNAL_CONTROL_SUPPORT BIT(1) #define WIIF_TDLS_OFFCHANNEL_SUPPORT BIT(2) -#if defined(FEATURE_WLAN_CH_AVOID) || defined(FEATURE_WLAN_FORCE_SAP_SCC) #define HDD_MAX_AVOID_FREQ_RANGES 4 /** * typedef struct sHddAvoidFreqRange - avoid frequency range @@ -190,7 +189,6 @@ typedef struct sHddAvoidFreqList { u32 avoidFreqRangeCount; tHddAvoidFreqRange avoidFreqRange[HDD_MAX_AVOID_FREQ_RANGES]; } tHddAvoidFreqList; -#endif /* FEATURE_WLAN_CH_AVOID || FEATURE_WLAN_FORCE_SAP_SCC */ #define CFG_NON_AGG_RETRY_MAX (31) #define CFG_AGG_RETRY_MAX (31) @@ -291,10 +289,8 @@ int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len); #endif -#if defined(FEATURE_WLAN_CH_AVOID) || defined(FEATURE_WLAN_FORCE_SAP_SCC) int wlan_hdd_send_avoid_freq_event(hdd_context_t *pHddCtx, tHddAvoidFreqList * pAvoidFreqList); -#endif /* FEATURE_WLAN_CH_AVOID || FEATURE_WLAN_FORCE_SAP_SCC */ #ifdef FEATURE_WLAN_EXTSCAN void wlan_hdd_cfg80211_extscan_callback(void *ctx,