From 7047d0d1a5d677cd3f269fe474e406ba22cba800 Mon Sep 17 00:00:00 2001 From: Vivek Date: Tue, 9 Jul 2019 19:30:40 +0530 Subject: [PATCH] qcacmn: Replace WIN/MCL from macro names There are macro defined differenly for WIN and MCL to pick up default INI value either for WIN or MCL. The macro name uses WIN and MCL and also enabling the right macro is controlled by CONFIG_MCL. Replace the macro with CONFIG_AP_PLATFORM. Change-Id: Ib5663532d45534cce1715ef06447116e2654e709 CRs-Fixed: 2484959 --- cfg/inc/cfg_define.h | 8 +++---- .../dispatcher/inc/cfg_green_ap_params.h | 4 ++-- umac/scan/dispatcher/inc/wlan_scan_cfg.h | 24 +++++++++---------- wlan_cfg/cfg_dp.h | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cfg/inc/cfg_define.h b/cfg/inc/cfg_define.h index 59423bd48362..375bce92154b 100644 --- a/cfg/inc/cfg_define.h +++ b/cfg/inc/cfg_define.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -85,10 +85,10 @@ enum cfg_fallback_behavior { (NON_INI, IPV6, struct qdf_ipv6_addr, name, -1, -1, -1, desc, def) /* utility macros/functions */ -#ifdef CONFIG_MCL -#define MCL_OR_WIN_VALUE(mcl_value, win_value) mcl_value +#ifdef CONFIG_AP_PLATFORM +#define PLATFORM_VALUE(non_ap_value, ap_value) ap_value #else -#define MCL_OR_WIN_VALUE(mcl_value, win_value) win_value +#define PLATFORM_VALUE(non_ap_value, ap_value) non_ap_value #endif #endif /* __CFG_DEFINE_H */ diff --git a/umac/green_ap/dispatcher/inc/cfg_green_ap_params.h b/umac/green_ap/dispatcher/inc/cfg_green_ap_params.h index 4cbb24916683..410dfb5d4786 100644 --- a/umac/green_ap/dispatcher/inc/cfg_green_ap_params.h +++ b/umac/green_ap/dispatcher/inc/cfg_green_ap_params.h @@ -43,7 +43,7 @@ #define CFG_ENABLE_GREEN_AP_FEATURE CFG_INI_BOOL( \ "gEnableGreenAp", \ - MCL_OR_WIN_VALUE(1, 0), \ + PLATFORM_VALUE(1, 0), \ "enable green ap") /* @@ -66,7 +66,7 @@ #define CFG_ENABLE_EGAP_FEATURE CFG_INI_BOOL( \ "gEnableEGAP", \ - MCL_OR_WIN_VALUE(1,0), \ + PLATFORM_VALUE(1, 0), \ "enable e-gap") /* * diff --git a/umac/scan/dispatcher/inc/wlan_scan_cfg.h b/umac/scan/dispatcher/inc/wlan_scan_cfg.h index fd28e5a73918..b063256f1576 100644 --- a/umac/scan/dispatcher/inc/wlan_scan_cfg.h +++ b/umac/scan/dispatcher/inc/wlan_scan_cfg.h @@ -63,7 +63,7 @@ */ #define CFG_ACTIVE_MAX_CHANNEL_TIME CFG_INI_UINT(\ "gActiveMaxChannelTime",\ - 0, 10000, MCL_OR_WIN_VALUE(40, 105),\ + 0, 10000, PLATFORM_VALUE(40, 105),\ CFG_VALUE_OR_DEFAULT, "active dwell time") /* @@ -125,7 +125,7 @@ */ #define CFG_ACTIVE_MAX_2G_CHANNEL_TIME CFG_INI_UINT(\ "active_max_channel_time_2g",\ - 0, 10000, MCL_OR_WIN_VALUE(80, 0),\ + 0, 10000, PLATFORM_VALUE(80, 0),\ CFG_VALUE_OR_DEFAULT, "active dwell time for 2G channels") /* @@ -146,7 +146,7 @@ */ #define CFG_PASSIVE_MAX_CHANNEL_TIME CFG_INI_UINT(\ "gPassiveMaxChannelTime",\ - 0, 10000, MCL_OR_WIN_VALUE(110, 300),\ + 0, 10000, PLATFORM_VALUE(110, 300),\ CFG_VALUE_OR_DEFAULT, "passive dwell time") /* @@ -161,7 +161,7 @@ */ #define CFG_SCAN_NUM_PROBES CFG_INI_UINT(\ "gScanNumProbes",\ - 0, 20, MCL_OR_WIN_VALUE(0, 2),\ + 0, 20, PLATFORM_VALUE(0, 2),\ CFG_VALUE_OR_DEFAULT,\ "number of probes on each channel") @@ -185,7 +185,7 @@ */ #define CFG_SCAN_PROBE_REPEAT_TIME CFG_INI_UINT(\ "gScanProbeRepeatTime",\ - 0, 30, MCL_OR_WIN_VALUE(20, 50),\ + 0, 30, PLATFORM_VALUE(20, 50),\ CFG_VALUE_OR_DEFAULT,\ "probe repeat time on each channel") @@ -217,7 +217,7 @@ */ #define CFG_ADAPTIVE_SCAN_DWELL_MODE CFG_INI_UINT(\ "hostscan_adaptive_dwell_mode",\ - 0, 4, MCL_OR_WIN_VALUE(2, 0),\ + 0, 4, PLATFORM_VALUE(2, 0),\ CFG_VALUE_OR_DEFAULT,\ "Enable adaptive dwell mode") @@ -249,7 +249,7 @@ */ #define CFG_ADAPTIVE_SCAN_DWELL_MODE_NC CFG_INI_UINT(\ "hostscan_adaptive_dwell_mode_no_conn",\ - 0, 4, MCL_OR_WIN_VALUE(4, 0),\ + 0, 4, PLATFORM_VALUE(4, 0),\ CFG_VALUE_OR_DEFAULT,\ "Enable adaptive dwell mode without connection") @@ -763,7 +763,7 @@ */ #define CFG_ACTIVE_MAX_CHANNEL_TIME_CONC CFG_INI_UINT(\ "gActiveMaxChannelTimeConc",\ - 0, 10000, MCL_OR_WIN_VALUE(40, 0),\ + 0, 10000, PLATFORM_VALUE(40, 0),\ CFG_VALUE_OR_DEFAULT, \ "active scan time in STA+SAP concurrent") @@ -787,7 +787,7 @@ */ #define CFG_PASSIVE_MAX_CHANNEL_TIME_CONC CFG_INI_UINT(\ "gPassiveMaxChannelTimeConc",\ - 0, 10000, MCL_OR_WIN_VALUE(110, 0),\ + 0, 10000, PLATFORM_VALUE(110, 0),\ CFG_VALUE_OR_DEFAULT, \ "Set priority for connection with bssid_hint") @@ -810,7 +810,7 @@ */ #define CFG_MAX_REST_TIME_CONC CFG_INI_UINT(\ "nRestTimeConc",\ - 0, 10000, MCL_OR_WIN_VALUE(100, 0),\ + 0, 10000, PLATFORM_VALUE(100, 0),\ CFG_VALUE_OR_DEFAULT, \ "Rest time before moving to a new channel") @@ -835,7 +835,7 @@ */ #define CFG_MIN_REST_TIME_CONC CFG_INI_UINT(\ "min_rest_time_conc",\ - 0, 50, MCL_OR_WIN_VALUE(50, 0),\ + 0, 50, PLATFORM_VALUE(50, 0),\ CFG_VALUE_OR_DEFAULT, \ "minimum time spent on home channel") @@ -883,7 +883,7 @@ */ #define CFG_IDLE_TIME_CONC CFG_INI_UINT(\ "gIdleTimeConc",\ - 0, 25, MCL_OR_WIN_VALUE(25, 0),\ + 0, 25, PLATFORM_VALUE(25, 0),\ CFG_VALUE_OR_DEFAULT, \ "data inactivity time on bss channel") diff --git a/wlan_cfg/cfg_dp.h b/wlan_cfg/cfg_dp.h index 40e64e755793..6837d4c0fceb 100644 --- a/wlan_cfg/cfg_dp.h +++ b/wlan_cfg/cfg_dp.h @@ -469,7 +469,7 @@ "DP peer flow ctrl Enable") #define CFG_DP_NAPI \ - CFG_INI_BOOL("dp_napi_enabled", MCL_OR_WIN_VALUE(true, false), \ + CFG_INI_BOOL("dp_napi_enabled", PLATFORM_VALUE(true, false), \ "DP Napi Enabled") #define CFG_DP_TCP_UDP_CKSUM_OFFLOAD \