From 219b6a0aae83e7960ea307baf859e3f6ab0c3e40 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 9 Dec 2018 10:16:16 -0800 Subject: [PATCH] qcacld-3.0: Remove gDisableDfsJapanW53 remnants Previously change I7f39ed0680919c6a383d9b8bae5864f979b6948c ("qcacld-3.0: Refactor more dfs cfg items") removed support for gDisableDfsJapanW53. However some remants of that support were left behind, so remove them. Change-Id: Ic0ec3411621c87a66a2d2055ceeebc2ed027aa39 CRs-Fixed: 2364103 --- core/hdd/inc/wlan_hdd_cfg.h | 1 - core/sap/inc/sap_api.h | 6 ------ core/sap/src/sap_internal.h | 1 - 3 files changed, 8 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index 81f8491ce2..249e3e30a1 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -3689,7 +3689,6 @@ struct hdd_config { uint32_t ibssPs1RxChainInAtimEnable; uint32_t IpaConfig; bool IpaClkScalingEnable; - uint8_t gDisableDfsJapanW53; bool fRegChangeDefCountry; bool advertiseConcurrentOperation; uint8_t enableFwModuleLogLevel[FW_MODULE_LOG_LEVEL_STRING_LENGTH]; diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index 1e4a9149ec..c3aaf1da6f 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -673,12 +673,6 @@ typedef struct sSapDfsInfo { enum phy_ch_width new_chanWidth; struct ch_params new_ch_params; - /* - * INI param to enable/disable SAP W53 - * channel operation. - */ - uint8_t is_dfs_w53_disabled; - /* * sap_operating_channel_location holds SAP indoor, * outdoor location information. Currently, if this diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h index 2cfba43fd8..f3cd44a7b9 100644 --- a/core/sap/src/sap_internal.h +++ b/core/sap/src/sap_internal.h @@ -58,7 +58,6 @@ extern "C" { #define IS_ETSI_WEATHER_CH(_ch) ((_ch >= 120) && (_ch <= 130)) #define IS_CH_BONDING_WITH_WEATHER_CH(_ch) (_ch == 116) -#define IS_CHAN_JAPAN_W53(_ch) ((_ch >= 52) && (_ch <= 64)) #define IS_CHAN_JAPAN_INDOOR(_ch) ((_ch >= 36) && (_ch <= 64)) #define IS_CHAN_JAPAN_OUTDOOR(_ch)((_ch >= 100) && (_ch <= 140)) #define DEFAULT_CAC_TIMEOUT (60 * 1000) /* msecs - 1 min */