diff options
| author | Hong Shi <hongsh@codeaurora.org> | 2017-03-08 23:33:14 +0800 |
|---|---|---|
| committer | Sandeep Puligilla <spuligil@codeaurora.org> | 2017-03-13 00:36:52 -0700 |
| commit | 95abfdd4de87e934e569dd2801542cd79c801770 (patch) | |
| tree | 0bf00c8d8f09915fdbf506e39b9f8b634c1c4fbf | |
| parent | 28a6544ea718ba0ad64df67b8114f2276f6a3def (diff) | |
qcacld-3.0: Fix compilation error when TDLS macro disabled
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
| -rw-r--r-- | core/hdd/inc/wlan_hdd_cfg.h | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index a32d3e7f24c6..92c866940cb4 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -5608,6 +5608,68 @@ typedef enum { #define CFG_ENABLE_TX_STBC_MAX (1) #define CFG_ENABLE_TX_STBC_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 /* * <ini> @@ -5682,68 +5744,6 @@ typedef enum { /* * <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> * gTDLSTxPacketThreshold - Tx/Rx Packet threshold for initiating TDLS. * @Min: 0 * @Max: 4294967295 |