samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Fix compilation error when TDLS macro disabled

Browse Source 
Currently, 3 non-tdls ini config options are wrongly merged inside
TDLS macro when auto propagation from CLD2.0 to CLD3.0. Move the ini
configs outside of TDLS macro.

Change-Id: I1ee784519c2197b4dc3f0119fb3a9f379fe7288b
CRs-Fixed: 2016679
This commit is contained in:
Hong Shi
2017-03-08 23:33:14 +08:00
committed by Sandeep Puligilla
parent 1f69b14c04
commit b707b05cc0
1 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
core/hdd/inc/wlan_hdd_cfg.h
View File

@@ -4930,6 +4930,68 @@ typedef enum {
#define CFG_ENABLE_RX_LDPC_MAX (1) #define CFG_ENABLE_RX_LDPC_MAX (1)
#define CFG_ENABLE_RX_LDPC_DEFAULT (0) #define CFG_ENABLE_RX_LDPC_DEFAULT (0)
/*
* <ini>
* gMaxHTMCSForTxData - max HT mcs for TX
* @Min: 0
* @Max: 383
* @Default: 0
*
* This ini is used to configure the max HT mcs
* for tx data.
*
* Usage: External
*
* bits 0-15: max HT mcs
* bits 16-31: zero to disable, otherwise enable.
*
* </ini>
*/
#define CFG_MAX_HT_MCS_FOR_TX_DATA "gMaxHTMCSForTxData"
#define CFG_MAX_HT_MCS_FOR_TX_DATA_MIN (WNI_CFG_MAX_HT_MCS_TX_DATA_STAMIN)
#define CFG_MAX_HT_MCS_FOR_TX_DATA_MAX (WNI_CFG_MAX_HT_MCS_TX_DATA_STAMAX)
#define CFG_MAX_HT_MCS_FOR_TX_DATA_DEFAULT (WNI_CFG_MAX_HT_MCS_TX_DATA_STADEF)
/*
* <ini>
* gDisableABGRateForTxData - disable abg rate for tx data
* @Min: 0
* @Max: 1
* @Default: 0
*
* This ini is used to disable abg rate for tx data.
*
* Usage: External
*
* </ini>
*/
#define CFG_DISABLE_ABG_RATE_FOR_TX_DATA "gDisableABGRateForTxData"
#define CFG_DISABLE_ABG_RATE_FOR_TX_DATA_MIN \
(WNI_CFG_DISABLE_ABG_RATE_FOR_TX_DATA_STAMIN)
#define CFG_DISABLE_ABG_RATE_FOR_TX_DATA_MAX \
(WNI_CFG_DISABLE_ABG_RATE_FOR_TX_DATA_STAMAX)
#define CFG_DISABLE_ABG_RATE_FOR_TX_DATA_DEFAULT \
(WNI_CFG_DISABLE_ABG_RATE_FOR_TX_DATA_STADEF)
/*
* <ini>
* gRateForTxMgmt - rate for tx mgmt frame
* @Min: 0x0
* @Max: 0xFF
* @Default: 0xFF
*
* This ini is used to configure the rate for tx
* mgmt frame. Default 0xFF means disable.
*
* Usage: External
*
* </ini>
*/
#define CFG_RATE_FOR_TX_MGMT "gRateForTxMgmt"
#define CFG_RATE_FOR_TX_MGMT_MIN (WNI_CFG_RATE_FOR_TX_MGMT_STAMIN)
#define CFG_RATE_FOR_TX_MGMT_MAX (WNI_CFG_RATE_FOR_TX_MGMT_STAMAX)
#define CFG_RATE_FOR_TX_MGMT_DEFAULT (WNI_CFG_RATE_FOR_TX_MGMT_STADEF)
#ifdef FEATURE_WLAN_TDLS #ifdef FEATURE_WLAN_TDLS
/* /*
* <ini> * <ini>
@@ -5002,68 +5064,6 @@ typedef enum {
#define CFG_TDLS_TX_STATS_PERIOD_MAX (4294967295UL) #define CFG_TDLS_TX_STATS_PERIOD_MAX (4294967295UL)
#define CFG_TDLS_TX_STATS_PERIOD_DEFAULT (2000) #define CFG_TDLS_TX_STATS_PERIOD_DEFAULT (2000)
/*
* <ini>
* gMaxHTMCSForTxData - max HT mcs for TX
* @Min: 0
* @Max: 383
* @Default: 0
*
* This ini is used to configure the max HT mcs
* for tx data.
*
* Usage: External
*
* bits 0-15: max HT mcs
* bits 16-31: zero to disable, otherwise enable.
*
* </ini>
*/
#define CFG_MAX_HT_MCS_FOR_TX_DATA "gMaxHTMCSForTxData"
#define CFG_MAX_HT_MCS_FOR_TX_DATA_MIN (WNI_CFG_MAX_HT_MCS_TX_DATA_STAMIN)
#define CFG_MAX_HT_MCS_FOR_TX_DATA_MAX (WNI_CFG_MAX_HT_MCS_TX_DATA_STAMAX)
#define CFG_MAX_HT_MCS_FOR_TX_DATA_DEFAULT (WNI_CFG_MAX_HT_MCS_TX_DATA_STADEF)
/*
* <ini>
* gDisableABGRateForTxData - disable abg rate for tx data
* @Min: 0
* @Max: 1
* @Default: 0
*
* This ini is used to disable abg rate for tx data.
*
* Usage: External
*
* </ini>
*/
#define CFG_DISABLE_ABG_RATE_FOR_TX_DATA "gDisableABGRateForTxData"
#define CFG_DISABLE_ABG_RATE_FOR_TX_DATA_MIN \
(WNI_CFG_DISABLE_ABG_RATE_FOR_TX_DATA_STAMIN)
#define CFG_DISABLE_ABG_RATE_FOR_TX_DATA_MAX \
(WNI_CFG_DISABLE_ABG_RATE_FOR_TX_DATA_STAMAX)
#define CFG_DISABLE_ABG_RATE_FOR_TX_DATA_DEFAULT \
(WNI_CFG_DISABLE_ABG_RATE_FOR_TX_DATA_STADEF)
/*
* <ini>
* gRateForTxMgmt - rate for tx mgmt frame
* @Min: 0x0
* @Max: 0xFF
* @Default: 0xFF
*
* This ini is used to configure the rate for tx
* mgmt frame. Default 0xFF means disable.
*
* Usage: External
*
* </ini>
*/
#define CFG_RATE_FOR_TX_MGMT "gRateForTxMgmt"
#define CFG_RATE_FOR_TX_MGMT_MIN (WNI_CFG_RATE_FOR_TX_MGMT_STAMIN)
#define CFG_RATE_FOR_TX_MGMT_MAX (WNI_CFG_RATE_FOR_TX_MGMT_STAMAX)
#define CFG_RATE_FOR_TX_MGMT_DEFAULT (WNI_CFG_RATE_FOR_TX_MGMT_STADEF)
/* /*
* <ini> * <ini>
* gTDLSTxPacketThreshold - Tx/Rx Packet threshold for initiating TDLS. * gTDLSTxPacketThreshold - Tx/Rx Packet threshold for initiating TDLS.