diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index f5be8f584c..bf10d821fc 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -256,30 +256,6 @@ struct hdd_context; #define CFG_HT_MPDU_DENSITY_MAX WNI_CFG_MPDU_DENSITY_STAMAX #define CFG_HT_MPDU_DENSITY_DEFAULT WNI_CFG_MPDU_DENSITY_STADEF -/* - * - * gEnableAdaptRxDrain - It will enable adapt received drain. - * @Min: 0 - * @Max: 1 - * @Default: 1 - * - * This ini is used to Configuration added to enable/disable CTS2SELF in - * Adaptive RX drain feature. - * - * Related: None - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ - -#define CFG_ENABLE_ADAPT_RX_DRAIN_NAME "gEnableAdaptRxDrain" -#define CFG_ENABLE_ADAPT_RX_DRAIN_MIN WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STAMIN -#define CFG_ENABLE_ADAPT_RX_DRAIN_MAX WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STAMAX -#define CFG_ENABLE_ADAPT_RX_DRAIN_DEFAULT WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STADEF - #define CFG_REG_CHANGE_DEF_COUNTRY_NAME "gRegulatoryChangeCountry" #define CFG_REG_CHANGE_DEF_COUNTRY_DEFAULT (0) #define CFG_REG_CHANGE_DEF_COUNTRY_MIN (0) @@ -650,19 +626,19 @@ enum hdd_dot11_mode { /* * - * gEnableDFSPnoChnlScan - Enable DFS PNO channel scan + * gEnableDFSPnoChnlScan - enable dfs channels in PNO scan * @Min: 0 * @Max: 1 * @Default: 1 * - * This ini is used to enable or disable DFS channel - * for PNO scan + * This ini is used to enable/disable dfs channels in PNO scan request, + * enabling this ini enables driver to include dfs channels in its + * PNO scan request + * Related: NA * - * Related: None + * Supported Feature: DFS, PNO * - * Supported Feature: Scan - * - * Usage: External + * Usage: Internal/External * * */ @@ -3098,21 +3074,6 @@ enum hdd_dot11_mode { #define CFG_VCC_UL_MAC_LOSS_THRESH_MAX (9) #define CFG_VCC_UL_MAC_LOSS_THRESH_DEFAULT (9) -#define CFG_RETRY_LIMIT_ZERO_NAME "gRetryLimitZero" -#define CFG_RETRY_LIMIT_ZERO_MIN (0) -#define CFG_RETRY_LIMIT_ZERO_MAX (15) -#define CFG_RETRY_LIMIT_ZERO_DEFAULT (5) - -#define CFG_RETRY_LIMIT_ONE_NAME "gRetryLimitOne" -#define CFG_RETRY_LIMIT_ONE_MIN (0) -#define CFG_RETRY_LIMIT_ONE_MAX (15) -#define CFG_RETRY_LIMIT_ONE_DEFAULT (10) - -#define CFG_RETRY_LIMIT_TWO_NAME "gRetryLimitTwo" -#define CFG_RETRY_LIMIT_TWO_MIN (0) -#define CFG_RETRY_LIMIT_TWO_MAX (15) -#define CFG_RETRY_LIMIT_TWO_DEFAULT (15) - #ifdef WLAN_AP_STA_CONCURRENCY /* * @@ -3297,59 +3258,6 @@ enum hdd_dot11_mode { #define CFG_TX_POWER_CTRL_MIN (0) #define CFG_TX_POWER_CTRL_MAX (1) -/* - * - * gLowGainOverride - Indicates Low Gain Override - * @Min: 0 - * @Max: 1 - * @Default: 0 - * - * This ini is used to set default Low Gain Override - * - * Related: None - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ - -#define CFG_LOW_GAIN_OVERRIDE_NAME "gLowGainOverride" -#define CFG_LOW_GAIN_OVERRIDE_MIN WNI_CFG_LOW_GAIN_OVERRIDE_STAMIN -#define CFG_LOW_GAIN_OVERRIDE_MAX WNI_CFG_LOW_GAIN_OVERRIDE_STAMAX -#define CFG_LOW_GAIN_OVERRIDE_DEFAULT WNI_CFG_LOW_GAIN_OVERRIDE_STADEF - -/* - * - * gRssiFilterPeriod - Enable gRssi Filter for RSSI Monitoring - * @Min: STAMIN - * @Max: STAMAX - * @Default: STADEF - * - * This ini is used to Increased this value for Non-ESE AP this is cause FW - * RSSI Monitoring the consumer of this value is ON by default. So to impact - * power numbers we are setting this to a high value. - * - * Related: None - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ - -#define CFG_RSSI_FILTER_PERIOD_NAME "gRssiFilterPeriod" -#define CFG_RSSI_FILTER_PERIOD_MIN WNI_CFG_RSSI_FILTER_PERIOD_STAMIN -#define CFG_RSSI_FILTER_PERIOD_MAX WNI_CFG_RSSI_FILTER_PERIOD_STAMAX -#define CFG_RSSI_FILTER_PERIOD_DEFAULT WNI_CFG_RSSI_FILTER_PERIOD_STADEF - -#define CFG_IGNORE_DTIM_NAME "gIgnoreDtim" -#define CFG_IGNORE_DTIM_MIN WNI_CFG_IGNORE_DTIM_STAMIN -#define CFG_IGNORE_DTIM_MAX WNI_CFG_IGNORE_DTIM_STAMAX -#define CFG_IGNORE_DTIM_DEFAULT WNI_CFG_IGNORE_DTIM_STADEF - /* * * gMaxLIModulatedDTIM - Set MaxLIModulate Dtim @@ -3373,75 +3281,6 @@ enum hdd_dot11_mode { #define CFG_MAX_LI_MODULATED_DTIM_MAX (10) #define CFG_MAX_LI_MODULATED_DTIM_DEFAULT (10) -/* - * - * gEnableFWHeartBeatMonitoring - Enable FWHeartBeat Monitor - * @Min: 0 - * @Max: 1 - * @Default: 1 - * - * This ini is used to set default FWHeartBeat Monitor - * - * Related: None - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ - -#define CFG_FW_HEART_BEAT_MONITORING_NAME "gEnableFWHeartBeatMonitoring" -#define CFG_FW_HEART_BEAT_MONITORING_MIN (0) -#define CFG_FW_HEART_BEAT_MONITORING_MAX (1) -#define CFG_FW_HEART_BEAT_MONITORING_DEFAULT (1) - -/* - * - * gEnableFWBeaconFiltering - Enable FWBeacon Filter - * @Min: 0 - * @Max: 1 - * @Default: 1 - * - * This ini is used to set default FWBeacon Filter - * - * Related: None - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ - -#define CFG_FW_BEACON_FILTERING_NAME "gEnableFWBeaconFiltering" -#define CFG_FW_BEACON_FILTERING_MIN (0) -#define CFG_FW_BEACON_FILTERING_MAX (1) -#define CFG_FW_BEACON_FILTERING_DEFAULT (1) - -/* - * - * gEnableFWRssiMonitoring - Enable FWRssi Monitor - * @Min: 0 - * @Max: 1 - * @Default: 1 - * - * This ini is used to set default FWRssi Monitor - * - * Related: None - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ - -#define CFG_FW_RSSI_MONITORING_NAME "gEnableFWRssiMonitoring" -#define CFG_FW_RSSI_MONITORING_MIN (0) -#define CFG_FW_RSSI_MONITORING_MAX (1) -#define CFG_FW_RSSI_MONITORING_DEFAULT (1) - /* * * gFWMccRtsCtsProtection - RTS-CTS protection in MCC. @@ -3530,29 +3369,6 @@ enum hdd_dot11_mode { #define CFG_WOW_DATA_INACTIVITY_TIMEOUT_MAX (255) #define CFG_WOW_DATA_INACTIVITY_TIMEOUT_DEFAULT (50) -/* - * - * rfSettlingTimeUs - Settle the TimeUs - * @Min: 0 - * @Max: 60000 - * @Default: 1500 - * - * This ini is used to set default TimeUs - * - * Related: None - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ - -#define CFG_RF_SETTLING_TIME_CLK_NAME "rfSettlingTimeUs" -#define CFG_RF_SETTLING_TIME_CLK_MIN (0) -#define CFG_RF_SETTLING_TIME_CLK_MAX (60000) -#define CFG_RF_SETTLING_TIME_CLK_DEFAULT (1500) - /* * * gStaKeepAlivePeriod - Sends NULL frame to AP periodically in @@ -4641,31 +4457,11 @@ enum station_keepalive_method { #define CFG_RM_CAPABILITY_NAME "rm_capability" #define CFG_RM_CAPABILITY_DEFAULT "73,10,91,00,04" -#define CFG_FT_RESOURCE_REQ_NAME "gFTResourceReqSupported" -#define CFG_FT_RESOURCE_REQ_MIN (0) -#define CFG_FT_RESOURCE_REQ_MAX (1) -#define CFG_FT_RESOURCE_REQ_DEFAULT (0) - -#define CFG_TELE_BCN_TRANS_LI_NAME "telescopicBeaconTransListenInterval" -#define CFG_TELE_BCN_TRANS_LI_MIN (0) -#define CFG_TELE_BCN_TRANS_LI_MAX (7) -#define CFG_TELE_BCN_TRANS_LI_DEFAULT (3) - -#define CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_NAME "telescopicBeaconTransListenIntervalNumIdleBcns" -#define CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_MIN (5) -#define CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_MAX (255) -#define CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_DEFAULT (10) - #define CFG_TELE_BCN_MAX_LI_NAME "telescopicBeaconMaxListenInterval" #define CFG_TELE_BCN_MAX_LI_MIN (0) #define CFG_TELE_BCN_MAX_LI_MAX (7) #define CFG_TELE_BCN_MAX_LI_DEFAULT (5) -#define CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_NAME "telescopicBeaconMaxListenIntervalNumIdleBcns" -#define CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_MIN (5) -#define CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_MAX (255) -#define CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_DEFAULT (15) - #define CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_NAME "gNeighborLookupThreshold" #define CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN (10) #define CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MAX (120) @@ -4729,29 +4525,6 @@ enum station_keepalive_method { #define CFG_ROAM_BEACON_RSSI_WEIGHT_MAX (16) #define CFG_ROAM_BEACON_RSSI_WEIGHT_DEFAULT (14) -/* - * - * gDynamicPSPollvalue - Set dynamic PSpoll value - * @Min: 0 - * @Max: 255 - * @Default: 0 - * - * This ini is used to send default PSpoll value - * - * Related: None - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ - -#define CFG_DYNAMIC_PSPOLL_VALUE_NAME "gDynamicPSPollvalue" -#define CFG_DYNAMIC_PSPOLL_VALUE_MIN (0) -#define CFG_DYNAMIC_PSPOLL_VALUE_MAX (255) -#define CFG_DYNAMIC_PSPOLL_VALUE_DEFAULT (0) - /* * * gTelescopicBeaconWakeupEn - Set teles copic beacon wakeup @@ -4775,34 +4548,6 @@ enum station_keepalive_method { #define CFG_TELE_BCN_WAKEUP_EN_MAX (1) #define CFG_TELE_BCN_WAKEUP_EN_DEFAULT (0) -/* - * - * gValidateScanList - Set valid date scan list - * @Min: 0 - * @Max: 65535 - * @Default: 30 - * - * This ini is used to set default valid date scan list - * - * Related: None - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ - -#define CFG_VALIDATE_SCAN_LIST_NAME "gValidateScanList" -#define CFG_VALIDATE_SCAN_LIST_MIN (0) -#define CFG_VALIDATE_SCAN_LIST_MAX (1) -#define CFG_VALIDATE_SCAN_LIST_DEFAULT (0) - -#define CFG_NULLDATA_AP_RESP_TIMEOUT_NAME "gNullDataApRespTimeout" -#define CFG_NULLDATA_AP_RESP_TIMEOUT_MIN (WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT_STAMIN) -#define CFG_NULLDATA_AP_RESP_TIMEOUT_MAX (WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT_STAMAX) -#define CFG_NULLDATA_AP_RESP_TIMEOUT_DEFAULT (WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT_STADEF) - #define CFG_AP_DATA_AVAIL_POLL_PERIOD_NAME "gApDataAvailPollInterval" #define CFG_AP_DATA_AVAIL_POLL_PERIOD_MIN (WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STAMIN) #define CFG_AP_DATA_AVAIL_POLL_PERIOD_MAX (WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD_STAMAX) @@ -4906,29 +4651,6 @@ enum station_keepalive_method { #define CFG_ENABLE_DFS_CHNL_SCAN_MAX (1) #define CFG_ENABLE_DFS_CHNL_SCAN_DEFAULT (1) -/* - * - * gEnableDFSPnoChnlScan - enable dfs channels in PNO scan - * @Min: 0 - * @Max: 1 - * @Default: 1 - * - * This ini is used to enable/disable dfs channels in PNO scan request, - * enabling this ini enables driver to include dfs channels in its - * PNO scan request - * Related: NA - * - * Supported Feature: DFS, PNO - * - * Usage: Internal/External - * - * - */ -#define CFG_ENABLE_DFS_PNO_CHNL_SCAN_NAME "gEnableDFSPnoChnlScan" -#define CFG_ENABLE_DFS_PNO_CHNL_SCAN_MIN (0) -#define CFG_ENABLE_DFS_PNO_CHNL_SCAN_MAX (1) -#define CFG_ENABLE_DFS_PNO_CHNL_SCAN_DEFAULT (1) - /* * * gEnableDumpCollect - It will use for collect the dumps @@ -5773,32 +5495,6 @@ enum hdd_link_speed_rpt_type { #define CFG_ENABLE_CCK_TX_FIR_OVERRIDE_MAX (1) #define CFG_ENABLE_CCK_TX_FIR_OVERRIDE_DEFAULT (0) -/* - * - * gDefaultRateIndex24Ghz -Set the rate index for 24Ghz - * @Min: 1 - * @Max: 9 - * @Default: 1 - * - * This ini is used to set default rate index - * In cfg.dat 1=1MBPS, 2=2MBPS, 3=5_5MBPS, 4=11MBPS, 5=6MBPS, 6=9MBPS, - * 7=12MBPS, 8=18MBPS, 9=24MBPS. But 6=9MBPS and 8=18MBPS are not basic - * 11g rates and should not be set by gDefaultRateIndex24Ghz. - * - * Related: None - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ - -#define CFG_DEFAULT_RATE_INDEX_24GH "gDefaultRateIndex24Ghz" -#define CFG_DEFAULT_RATE_INDEX_24GH_MIN (1) -#define CFG_DEFAULT_RATE_INDEX_24GH_MAX (9) -#define CFG_DEFAULT_RATE_INDEX_24GH_DEFAULT (1) - #define CFG_ENABLE_PACKET_LOG "gEnablePacketLog" #define CFG_ENABLE_PACKET_LOG_MIN (0) #define CFG_ENABLE_PACKET_LOG_MAX (1) @@ -5894,32 +5590,6 @@ enum hdd_link_speed_rpt_type { #define CFG_ENABLE_FW_RTS_PROFILE_DEFAULT (33) -#ifdef FEATURE_WLAN_FORCE_SAP_SCC -/* - * - * gSapSccChanAvoidance - Channel avoidance for SAP in SCC. - * @Min: 0 - * @Max: 1 - * @Default: 0 - * - * This ini is used to enable/disable channel avoidance for SAP in SCC - * scenario. - * - * Related: None. - * - * Supported Feature: Concurrency - * - * Usage: Internal/External - * - * - */ - -#define CFG_SAP_SCC_CHAN_AVOIDANCE "gSapSccChanAvoidance" -#define CFG_SAP_SCC_CHAN_AVOIDANCE_MIN (0) -#define CFG_SAP_SCC_CHAN_AVOIDANCE_MAX (1) -#define CFG_SAP_SCC_CHAN_AVOIDANCE_DEFAULT (0) -#endif /* FEATURE_WLAN_FORCE_SAP_SCC */ - /* * QDF Trace Enable Control * Notes: @@ -7308,12 +6978,6 @@ enum hdd_link_speed_rpt_type { #define CFG_TDLS_ENABLE_DEFER_TIMER_MAX (6000) #define CFG_TDLS_ENABLE_DEFER_TIMER_DEFAULT (2000) -/* Enable/Disable LPWR Image(cMEM uBSP) Transition */ -#define CFG_ENABLE_LPWR_IMG_TRANSITION_NAME "gEnableLpwrImgTransition" -#define CFG_ENABLE_LPWR_IMG_TRANSITION_MIN (0) -#define CFG_ENABLE_LPWR_IMG_TRANSITION_MAX (1) -#define CFG_ENABLE_LPWR_IMG_TRANSITION_DEFAULT (0) - /* * * gTxLdpcEnable - Config Param to enable Tx LDPC capability @@ -7483,75 +7147,6 @@ enum hdd_link_speed_rpt_type { #define CFG_ENABLE_VENDOR_VHT_FOR_24GHZ_MAX (1) #define CFG_ENABLE_VENDOR_VHT_FOR_24GHZ_DEFAULT (1) -/* - * - * gMaxMediumTime - Set Maximum channel time - * @Min: STAMIN - * @Max: STAMAX - * @Default: STADEF - * - * This ini is used to set default max channel time - * - * Related: None - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ - -#define CFG_MAX_MEDIUM_TIME "gMaxMediumTime" -#define CFG_MAX_MEDIUM_TIME_STAMIN WNI_CFG_MAX_MEDIUM_TIME_STAMIN -#define CFG_MAX_MEDIUM_TIME_STAMAX WNI_CFG_MAX_MEDIUM_TIME_STAMAX -#define CFG_MAX_MEDIUM_TIME_STADEFAULT WNI_CFG_MAX_MEDIUM_TIME_STADEF - -/* - * - * gEnableIbssHeartBeatOffload - Enable heart beat monitoring offload to FW - * @Min: 0 - * @Max: 1 - * @Default: 1 - * - * This ini is used to set default ibbs heartbeat offload - * - * Related: None - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ - -#define CFG_ENABLE_HEART_BEAT_OFFLOAD "gEnableIbssHeartBeatOffload" -#define CFG_ENABLE_HEART_BEAT_OFFLOAD_MIN (0) -#define CFG_ENABLE_HEART_BEAT_OFFLOAD_MAX (1) -#define CFG_ENABLE_HEART_BEAT_OFFLOAD_DEFAULT (1) - -/* - * - * gAntennaDiversity - It will use to set Antenna diversity - * @Min: 0 - * @Max: 3 - * @Default: 0 - * - * This ini is used to set default Antenna diversity - * - * Related: None - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ - -#define CFG_ANTENNA_DIVERSITY_PARAM_NAME "gAntennaDiversity" -#define CFG_ANTENNA_DIVERSITY_PARAM_MIN (0) -#define CFG_ANTENNA_DIVERSITY_PARAM_MAX (3) -#define CFG_ANTENNA_DIVERSITY_PARAM_DEFAULT (0) - /* * * gEnableSNRMonitoring - Enables SNR Monitoring @@ -10619,23 +10214,6 @@ enum hdd_wext_control { #define CFG_POWER_USAGE_MAX "Max" #define CFG_POWER_USAGE_DEFAULT "Mod" -/* - * - * gWowlPattern - WOW Pattern to used when PBM filtering is enabled - * @Default: - * - * This ini is used to set the WOW Pattern to be used for PBM Filtering - * - * Related: gMaxWoWFilters - * - * Supported Feature: Power Save - * - * Usage: External - * - * - */ -#define CFG_WOWL_PATTERN_NAME "gWowlPattern" -#define CFG_WOWL_PATTERN_DEFAULT "" /* * @@ -11575,46 +11153,6 @@ enum hdd_wext_control { #endif /* WLAN_FEATURE_11AX */ -/** - * enum l1ss_sleep_allowed - when L1ss Sleep is allowed on capable platforms - * @L1SS_SLEEP_ALLOWED_NEVER: never allow L1ss Sleep - * @L1SS_SLEEP_ALLOWED_STA_CONNECTED: allow in station mode (connected) - * @L1SS_SLEEP_ALLOWED_STA_DISCONNECTED: allow in station mode (disconnected) - * @L1SS_SLEEP_ALLOWED_ALWAYS: always allow L1ss Sleep - */ -enum l1ss_sleep_allowed { - L1SS_SLEEP_ALLOWED_NEVER = 0, - L1SS_SLEEP_ALLOWED_STA_CONNECTED = BIT(0), - L1SS_SLEEP_ALLOWED_STA_DISCONNECTED = BIT(1), - L1SS_SLEEP_ALLOWED_ALWAYS = 0xff -}; - -/* - * - * gL1ssSleepAllowed - Control when L1ss Sleep is allowed on capable platforms - * @Min: 0 (disabled) - * @Max: 255 (always allow) - * @Default: 1 (station mode - connected) - * - * This config item controls when L1ss Sleep is allowed on capable platforms. - * The default is connected station mode to support DTIM power savings. - * 0) never allow - * 1) station mode (connected) - * 2) station mode (disconnected) - * 255) always allow - * - * Related: N/A - * - * Supported Feature: L1ss Sleep - * - * Usage: Internal/External - * - */ -#define CFG_L1SS_SLEEP_ALLOWED_NAME "gL1ssSleepAllowed" -#define CFG_L1SS_SLEEP_ALLOWED_MIN (L1SS_SLEEP_ALLOWED_NEVER) -#define CFG_L1SS_SLEEP_ALLOWED_MAX (L1SS_SLEEP_ALLOWED_ALWAYS) -#define CFG_L1SS_SLEEP_ALLOWED_DEFAULT (L1SS_SLEEP_ALLOWED_STA_CONNECTED) - /* * * gEnableANI - Enable Adaptive Noise Immunity @@ -14439,16 +13977,12 @@ struct hdd_config { uint32_t nBeaconInterval; uint8_t nTxPowerCap; /* In dBm */ bool allow_tpc_from_ap; - bool fIsLowGainOverride; uint8_t disablePacketFilter; bool fRrmEnable; uint16_t nRrmRandnIntvl; /* length includes separator */ char rm_capability[3 * DOT11F_IE_RRMENABLEDCAP_MAX_LEN]; - /* Vowifi 11r params */ - bool fFTResourceReqSupported; - /* Bitmap for operating voltage corner mode */ uint32_t vc_mode_cfg_bitmap; @@ -14501,12 +14035,8 @@ struct hdd_config { uint8_t nMaxPsPoll; uint8_t nRssiFilterPeriod; - bool fIgnoreDtim; uint8_t fMaxLIModulatedDTIM; - uint8_t fEnableFwHeartBeatMonitoring; - uint8_t fEnableFwBeaconFiltering; - bool fEnableFwRssiMonitoring; bool mcc_rts_cts_prot_enable; bool mcc_bcast_prob_resp_enable; uint8_t nDataInactivityTimeout; @@ -14575,9 +14105,6 @@ struct hdd_config { char enableConcurrentSTA[CFG_CONCURRENT_IFACE_MAX_LEN]; - /* Wowl pattern */ - char wowlPattern[1024]; - /* Control for Replay counetr. value 1 means * single replay counter for all TID */ @@ -14602,18 +14129,10 @@ struct hdd_config { bool burstSizeDefinition; uint8_t tsInfoAckPolicy; - /* RF Settling Time Clock */ - uint32_t rfSettlingTimeUs; - - uint8_t dynamicPsPollValue; bool AddTSWhenACMIsOff; - bool fValidateScanList; uint32_t infraStaKeepAlivePeriod; - uint8_t nNullDataApRespTimeout; uint8_t nBandCapability; - - uint32_t apDataAvailPollPeriodInMs; bool teleBcnWakeupEn; /* QDF Trace Control*/ @@ -14642,10 +14161,7 @@ struct hdd_config { uint16_t qdf_trace_enable_regulatory; uint16_t qdf_trace_enable_cp_stats; - uint16_t nTeleBcnTransListenInterval; uint16_t nTeleBcnMaxListenInterval; - uint16_t nTeleBcnTransLiNumIdleBeacons; - uint16_t nTeleBcnMaxLiNumIdleBeacons; uint8_t enableBypass11d; uint8_t enableDFSChnlScan; uint8_t enable_dfs_pno_chnl_scan; @@ -14759,23 +14275,15 @@ struct hdd_config { #ifdef WLAN_SOFTAP_VSTA_FEATURE bool fEnableVSTASupport; #endif - uint32_t enableLpwrImgTransition; uint8_t scanAgingTimeout; uint8_t disableLDPCWithTxbfAP; uint8_t enableMCCAdaptiveScheduler; bool sapAllowAllChannel; - uint8_t retryLimitZero; - uint8_t retryLimitOne; - uint8_t retryLimitTwo; bool enableSSR; bool enable_data_stall_det; - uint32_t cfgMaxMediumTime; bool enableVhtFor24GHzBand; bool enable_sap_vendor_vht; bool bFastRoamInConIniFeatureEnabled; - bool fEnableAdaptRxDrain; - bool enableIbssHeartBeatOffload; - uint32_t antennaDiversity; bool fEnableSNRMonitoring; /*PNO related parameters */ #ifdef FEATURE_WLAN_SCAN_PNO @@ -14864,11 +14372,6 @@ struct hdd_config { bool enableMemDeepSleep; bool enable_cck_tx_fir_override; - uint32_t defaultRateIndex24Ghz; -#ifdef MEMORY_DEBUG - bool IsMemoryDebugSupportEnabled; -#endif - uint8_t allowDFSChannelRoam; bool debugP2pRemainOnChannel; @@ -15145,7 +14648,6 @@ struct hdd_config { bool enable_ul_ofdma; uint32_t he_sta_obsspd; #endif - enum l1ss_sleep_allowed l1ss_sleep_allowed; uint32_t arp_ac_category; bool ani_enabled; bool qcn_ie_support; diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 9358813f66..eb205c3a7e 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -129,15 +129,6 @@ cb_notify_set_ese_feature_enabled(struct hdd_context *hdd_ctx, hdd_ctx->config->isEseIniFeatureEnabled); } #endif - -static void -cb_notify_set_fw_rssi_monitoring(struct hdd_context *hdd_ctx, unsigned long notifyId) -{ - sme_update_config_fw_rssi_monitoring(hdd_ctx->hHal, - hdd_ctx->config-> - fEnableFwRssiMonitoring); -} - static void cb_notify_set_opportunistic_scan_threshold_diff(struct hdd_context *hdd_ctx, unsigned long notifyId) { @@ -760,27 +751,6 @@ struct reg_table_entry g_registry_table[] = { CFG_SCAN_PROBE_REPEAT_TIME_MIN, CFG_SCAN_PROBE_REPEAT_TIME_MAX), - REG_VARIABLE(CFG_RETRY_LIMIT_ZERO_NAME, WLAN_PARAM_Integer, - struct hdd_config, retryLimitZero, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_RETRY_LIMIT_ZERO_DEFAULT, - CFG_RETRY_LIMIT_ZERO_MIN, - CFG_RETRY_LIMIT_ZERO_MAX), - - REG_VARIABLE(CFG_RETRY_LIMIT_ONE_NAME, WLAN_PARAM_Integer, - struct hdd_config, retryLimitOne, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_RETRY_LIMIT_ONE_DEFAULT, - CFG_RETRY_LIMIT_ONE_MIN, - CFG_RETRY_LIMIT_ONE_MAX), - - REG_VARIABLE(CFG_RETRY_LIMIT_TWO_NAME, WLAN_PARAM_Integer, - struct hdd_config, retryLimitTwo, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_RETRY_LIMIT_TWO_DEFAULT, - CFG_RETRY_LIMIT_TWO_MIN, - CFG_RETRY_LIMIT_TWO_MAX), - #ifdef WLAN_AP_STA_CONCURRENCY REG_VARIABLE(CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_NAME, WLAN_PARAM_Integer, struct hdd_config, nPassiveMaxChnTimeConc, @@ -853,27 +823,6 @@ struct reg_table_entry g_registry_table[] = { CFG_TX_POWER_CTRL_MIN, CFG_TX_POWER_CTRL_MAX), - REG_VARIABLE(CFG_LOW_GAIN_OVERRIDE_NAME, WLAN_PARAM_Integer, - struct hdd_config, fIsLowGainOverride, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_LOW_GAIN_OVERRIDE_DEFAULT, - CFG_LOW_GAIN_OVERRIDE_MIN, - CFG_LOW_GAIN_OVERRIDE_MAX), - - REG_VARIABLE(CFG_RSSI_FILTER_PERIOD_NAME, WLAN_PARAM_Integer, - struct hdd_config, nRssiFilterPeriod, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_RSSI_FILTER_PERIOD_DEFAULT, - CFG_RSSI_FILTER_PERIOD_MIN, - CFG_RSSI_FILTER_PERIOD_MAX), - - REG_VARIABLE(CFG_IGNORE_DTIM_NAME, WLAN_PARAM_Integer, - struct hdd_config, fIgnoreDtim, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_IGNORE_DTIM_DEFAULT, - CFG_IGNORE_DTIM_MIN, - CFG_IGNORE_DTIM_MAX), - REG_VARIABLE(CFG_MAX_LI_MODULATED_DTIM_NAME, WLAN_PARAM_Integer, struct hdd_config, fMaxLIModulatedDTIM, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -881,29 +830,6 @@ struct reg_table_entry g_registry_table[] = { CFG_MAX_LI_MODULATED_DTIM_MIN, CFG_MAX_LI_MODULATED_DTIM_MAX), - REG_VARIABLE(CFG_FW_HEART_BEAT_MONITORING_NAME, WLAN_PARAM_Integer, - struct hdd_config, fEnableFwHeartBeatMonitoring, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_FW_HEART_BEAT_MONITORING_DEFAULT, - CFG_FW_HEART_BEAT_MONITORING_MIN, - CFG_FW_HEART_BEAT_MONITORING_MAX), - - REG_VARIABLE(CFG_FW_BEACON_FILTERING_NAME, WLAN_PARAM_Integer, - struct hdd_config, fEnableFwBeaconFiltering, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_FW_BEACON_FILTERING_DEFAULT, - CFG_FW_BEACON_FILTERING_MIN, - CFG_FW_BEACON_FILTERING_MAX), - - REG_DYNAMIC_VARIABLE(CFG_FW_RSSI_MONITORING_NAME, WLAN_PARAM_Integer, - struct hdd_config, fEnableFwRssiMonitoring, - VAR_FLAGS_OPTIONAL | - VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_FW_RSSI_MONITORING_DEFAULT, - CFG_FW_RSSI_MONITORING_MIN, - CFG_FW_RSSI_MONITORING_MAX, - cb_notify_set_fw_rssi_monitoring, 0), - REG_VARIABLE(CFG_FW_MCC_RTS_CTS_PROT_NAME, WLAN_PARAM_Integer, struct hdd_config, mcc_rts_cts_prot_enable, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -1311,11 +1237,6 @@ struct reg_table_entry g_registry_table[] = { CFG_TL_DELAYED_TRGR_FRM_INT_MIN, CFG_TL_DELAYED_TRGR_FRM_INT_MAX), - REG_VARIABLE_STRING(CFG_WOWL_PATTERN_NAME, WLAN_PARAM_String, - struct hdd_config, wowlPattern, - VAR_FLAGS_OPTIONAL, - (void *)CFG_WOWL_PATTERN_DEFAULT), - REG_VARIABLE(CFG_QOS_IMPLICIT_SETUP_ENABLED_NAME, WLAN_PARAM_Integer, struct hdd_config, bImplicitQosEnabled, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -1358,13 +1279,6 @@ struct reg_table_entry g_registry_table[] = { VAR_FLAGS_OPTIONAL, (void *) CFG_RM_CAPABILITY_DEFAULT), - REG_VARIABLE(CFG_FT_RESOURCE_REQ_NAME, WLAN_PARAM_Integer, - struct hdd_config, fFTResourceReqSupported, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_FT_RESOURCE_REQ_DEFAULT, - CFG_FT_RESOURCE_REQ_MIN, - CFG_FT_RESOURCE_REQ_MAX), - REG_DYNAMIC_VARIABLE(CFG_NEIGHBOR_SCAN_TIMER_PERIOD_NAME, WLAN_PARAM_Integer, struct hdd_config, nNeighborScanPeriod, @@ -1661,13 +1575,6 @@ struct reg_table_entry g_registry_table[] = { CFG_SINGLE_TID_RC_MIN, CFG_SINGLE_TID_RC_MAX), - REG_VARIABLE(CFG_DYNAMIC_PSPOLL_VALUE_NAME, WLAN_PARAM_Integer, - struct hdd_config, dynamicPsPollValue, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_DYNAMIC_PSPOLL_VALUE_DEFAULT, - CFG_DYNAMIC_PSPOLL_VALUE_MIN, - CFG_DYNAMIC_PSPOLL_VALUE_MAX), - REG_VARIABLE(CFG_TELE_BCN_WAKEUP_EN_NAME, WLAN_PARAM_Integer, struct hdd_config, teleBcnWakeupEn, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -1696,27 +1603,6 @@ struct reg_table_entry g_registry_table[] = { CFG_QOS_ADDTS_WHEN_ACM_IS_OFF_MIN, CFG_QOS_ADDTS_WHEN_ACM_IS_OFF_MAX), - REG_VARIABLE(CFG_VALIDATE_SCAN_LIST_NAME, WLAN_PARAM_Integer, - struct hdd_config, fValidateScanList, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_VALIDATE_SCAN_LIST_DEFAULT, - CFG_VALIDATE_SCAN_LIST_MIN, - CFG_VALIDATE_SCAN_LIST_MAX), - - REG_VARIABLE(CFG_NULLDATA_AP_RESP_TIMEOUT_NAME, WLAN_PARAM_Integer, - struct hdd_config, nNullDataApRespTimeout, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_NULLDATA_AP_RESP_TIMEOUT_DEFAULT, - CFG_NULLDATA_AP_RESP_TIMEOUT_MIN, - CFG_NULLDATA_AP_RESP_TIMEOUT_MAX), - - REG_VARIABLE(CFG_AP_DATA_AVAIL_POLL_PERIOD_NAME, WLAN_PARAM_Integer, - struct hdd_config, apDataAvailPollPeriodInMs, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_AP_DATA_AVAIL_POLL_PERIOD_DEFAULT, - CFG_AP_DATA_AVAIL_POLL_PERIOD_MIN, - CFG_AP_DATA_AVAIL_POLL_PERIOD_MAX), - REG_VARIABLE(CFG_BAND_CAPABILITY_NAME, WLAN_PARAM_Integer, struct hdd_config, nBandCapability, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -1886,21 +1772,6 @@ struct reg_table_entry g_registry_table[] = { CFG_QDF_TRACE_ENABLE_MIN, CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_TELE_BCN_TRANS_LI_NAME, WLAN_PARAM_Integer, - struct hdd_config, nTeleBcnTransListenInterval, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_TELE_BCN_TRANS_LI_DEFAULT, - CFG_TELE_BCN_TRANS_LI_MIN, - CFG_TELE_BCN_TRANS_LI_MAX), - - REG_VARIABLE(CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_NAME, - WLAN_PARAM_Integer, - struct hdd_config, nTeleBcnTransLiNumIdleBeacons, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_DEFAULT, - CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_MIN, - CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_MAX), - REG_VARIABLE(CFG_TELE_BCN_MAX_LI_NAME, WLAN_PARAM_Integer, struct hdd_config, nTeleBcnMaxListenInterval, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -1908,13 +1779,6 @@ struct reg_table_entry g_registry_table[] = { CFG_TELE_BCN_MAX_LI_MIN, CFG_TELE_BCN_MAX_LI_MAX), - REG_VARIABLE(CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_NAME, WLAN_PARAM_Integer, - struct hdd_config, nTeleBcnMaxLiNumIdleBeacons, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_DEFAULT, - CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_MIN, - CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_MAX), - REG_VARIABLE(CFG_ENABLE_BYPASS_11D_NAME, WLAN_PARAM_Integer, struct hdd_config, enableBypass11d, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -2537,19 +2401,6 @@ struct reg_table_entry g_registry_table[] = { CFG_VSTA_SUPPORT_ENABLE_MIN, CFG_VSTA_SUPPORT_ENABLE_MAX), #endif - REG_VARIABLE(CFG_ENABLE_LPWR_IMG_TRANSITION_NAME, WLAN_PARAM_Integer, - struct hdd_config, enableLpwrImgTransition, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_ENABLE_LPWR_IMG_TRANSITION_DEFAULT, - CFG_ENABLE_LPWR_IMG_TRANSITION_MIN, - CFG_ENABLE_LPWR_IMG_TRANSITION_MAX), - - REG_VARIABLE(CFG_ENABLE_LPWR_IMG_TRANSITION_NAME, WLAN_PARAM_Integer, - struct hdd_config, enableLpwrImgTransition, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_ENABLE_LPWR_IMG_TRANSITION_DEFAULT, - CFG_ENABLE_LPWR_IMG_TRANSITION_MIN, - CFG_ENABLE_LPWR_IMG_TRANSITION_MAX), REG_VARIABLE(CFG_SCAN_AGING_PARAM_NAME, WLAN_PARAM_Integer, struct hdd_config, scanAgingTimeout, @@ -2666,13 +2517,6 @@ struct reg_table_entry g_registry_table[] = { CFG_ENABLE_DATA_STALL_DETECTION_MIN, CFG_ENABLE_DATA_STALL_DETECTION_MAX), - REG_VARIABLE(CFG_MAX_MEDIUM_TIME, WLAN_PARAM_Integer, - struct hdd_config, cfgMaxMediumTime, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_MAX_MEDIUM_TIME_STADEFAULT, - CFG_MAX_MEDIUM_TIME_STAMIN, - CFG_MAX_MEDIUM_TIME_STAMAX), - REG_VARIABLE(CFG_ENABLE_VHT_FOR_24GHZ_NAME, WLAN_PARAM_Integer, struct hdd_config, enableVhtFor24GHzBand, VAR_FLAGS_OPTIONAL, @@ -2698,27 +2542,6 @@ struct reg_table_entry g_registry_table[] = { CFG_ENABLE_FAST_ROAM_IN_CONCURRENCY_MAX, cb_notify_set_enable_fast_roam_in_concurrency, 0), - REG_VARIABLE(CFG_ENABLE_ADAPT_RX_DRAIN_NAME, WLAN_PARAM_Integer, - struct hdd_config, fEnableAdaptRxDrain, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, - CFG_ENABLE_ADAPT_RX_DRAIN_DEFAULT, - CFG_ENABLE_ADAPT_RX_DRAIN_MIN, - CFG_ENABLE_ADAPT_RX_DRAIN_MAX), - - REG_VARIABLE(CFG_ENABLE_HEART_BEAT_OFFLOAD, WLAN_PARAM_Integer, - struct hdd_config, enableIbssHeartBeatOffload, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_ENABLE_HEART_BEAT_OFFLOAD_DEFAULT, - CFG_ENABLE_HEART_BEAT_OFFLOAD_MIN, - CFG_ENABLE_HEART_BEAT_OFFLOAD_MAX), - - REG_VARIABLE(CFG_ANTENNA_DIVERSITY_PARAM_NAME, WLAN_PARAM_Integer, - struct hdd_config, antennaDiversity, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_ANTENNA_DIVERSITY_PARAM_DEFAULT, - CFG_ANTENNA_DIVERSITY_PARAM_MIN, - CFG_ANTENNA_DIVERSITY_PARAM_MAX), - REG_VARIABLE(CFG_ENABLE_SNR_MONITORING_NAME, WLAN_PARAM_Integer, struct hdd_config, fEnableSNRMonitoring, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, @@ -3161,22 +2984,6 @@ struct reg_table_entry g_registry_table[] = { CFG_ENABLE_CCK_TX_FIR_OVERRIDE_MIN, CFG_ENABLE_CCK_TX_FIR_OVERRIDE_MAX), - REG_VARIABLE(CFG_DEFAULT_RATE_INDEX_24GH, WLAN_PARAM_Integer, - struct hdd_config, defaultRateIndex24Ghz, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_DEFAULT_RATE_INDEX_24GH_DEFAULT, - CFG_DEFAULT_RATE_INDEX_24GH_MIN, - CFG_DEFAULT_RATE_INDEX_24GH_MAX), - -#ifdef MEMORY_DEBUG - REG_VARIABLE(CFG_ENABLE_MEMORY_DEBUG_NAME, WLAN_PARAM_Integer, - struct hdd_config, IsMemoryDebugSupportEnabled, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_ENABLE_MEMORY_DEBUG_DEFAULT, - CFG_ENABLE_MEMORY_DEBUG_MIN, - CFG_ENABLE_MEMORY_DEBUG_MAX), -#endif - REG_VARIABLE(CFG_DEBUG_P2P_REMAIN_ON_CHANNEL_NAME, WLAN_PARAM_Integer, struct hdd_config, debugP2pRemainOnChannel, VAR_FLAGS_OPTIONAL, @@ -3448,15 +3255,6 @@ struct reg_table_entry g_registry_table[] = { CFG_ENABLE_SELF_RECOVERY_MIN, CFG_ENABLE_SELF_RECOVERY_MAX), -#ifdef FEATURE_WLAN_FORCE_SAP_SCC - REG_VARIABLE(CFG_SAP_SCC_CHAN_AVOIDANCE, WLAN_PARAM_Integer, - struct hdd_config, SapSccChanAvoidance, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_SAP_SCC_CHAN_AVOIDANCE_DEFAULT, - CFG_SAP_SCC_CHAN_AVOIDANCE_MIN, - CFG_SAP_SCC_CHAN_AVOIDANCE_MAX), -#endif /* FEATURE_WLAN_FORCE_SAP_SCC */ - REG_VARIABLE(CFG_ENABLE_SAP_SUSPEND, WLAN_PARAM_Integer, struct hdd_config, enable_sap_suspend, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -4223,6 +4021,7 @@ struct reg_table_entry g_registry_table[] = { CFG_ENABLE_NAN_NDI_CHANNEL_MIN, CFG_ENABLE_NAN_NDI_CHANNEL_MAX), #endif + REG_VARIABLE(CFG_CREATE_BUG_REPORT_FOR_SCAN, WLAN_PARAM_Integer, struct hdd_config, bug_report_for_no_scan_results, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -4607,13 +4406,6 @@ struct reg_table_entry g_registry_table[] = { CFG_HE_STA_OBSSPD_MAX), #endif - REG_VARIABLE(CFG_L1SS_SLEEP_ALLOWED_NAME, WLAN_PARAM_Integer, - struct hdd_config, l1ss_sleep_allowed, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_L1SS_SLEEP_ALLOWED_DEFAULT, - CFG_L1SS_SLEEP_ALLOWED_MIN, - CFG_L1SS_SLEEP_ALLOWED_MAX), - REG_VARIABLE(CFG_ARP_AC_CATEGORY, WLAN_PARAM_Integer, struct hdd_config, arp_ac_category, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -6696,9 +6488,6 @@ void hdd_cfg_print(struct hdd_context *hdd_ctx) hdd_debug("Name = [IsRArateLimitEnabled] Value = [%u] ", hdd_ctx->config->IsRArateLimitEnabled); #endif - hdd_debug("Name = [fFTResourceReqSupported] Value = [%u] ", - hdd_ctx->config->fFTResourceReqSupported); - hdd_debug("Name = [nNeighborLookupRssiThreshold] Value = [%u] ", hdd_ctx->config->nNeighborLookupRssiThreshold); hdd_debug("Name = [%s] Value = [%d] ", @@ -6744,33 +6533,18 @@ void hdd_cfg_print(struct hdd_context *hdd_ctx) hdd_ctx->config->burstSizeDefinition); hdd_debug("Name = [tsInfoAckPolicy] Value = [0x%x] ", hdd_ctx->config->tsInfoAckPolicy); - hdd_debug("Name = [rfSettlingTimeUs] Value = [%u] ", - hdd_ctx->config->rfSettlingTimeUs); hdd_debug("Name = [bSingleTidRc] Value = [%u] ", hdd_ctx->config->bSingleTidRc); - hdd_debug("Name = [gDynamicPSPollvalue] Value = [%u] ", - hdd_ctx->config->dynamicPsPollValue); hdd_debug("Name = [gAddTSWhenACMIsOff] Value = [%u] ", hdd_ctx->config->AddTSWhenACMIsOff); - hdd_debug("Name = [gValidateScanList] Value = [%u] ", - hdd_ctx->config->fValidateScanList); - hdd_debug("Name = [gStaKeepAlivePeriod] Value = [%u] ", hdd_ctx->config->infraStaKeepAlivePeriod); - hdd_debug("Name = [gApDataAvailPollInterVal] Value = [%u] ", - hdd_ctx->config->apDataAvailPollPeriodInMs); hdd_debug("Name = [BandCapability] Value = [%u] ", hdd_ctx->config->nBandCapability); hdd_debug("Name = [teleBcnWakeupEnable] Value = [%u] ", hdd_ctx->config->teleBcnWakeupEn); - hdd_debug("Name = [transListenInterval] Value = [%u] ", - hdd_ctx->config->nTeleBcnTransListenInterval); - hdd_debug("Name = [transLiNumIdleBeacons] Value = [%u] ", - hdd_ctx->config->nTeleBcnTransLiNumIdleBeacons); hdd_debug("Name = [maxListenInterval] Value = [%u] ", hdd_ctx->config->nTeleBcnMaxListenInterval); - hdd_debug("Name = [maxLiNumIdleBeacons] Value = [%u] ", - hdd_ctx->config->nTeleBcnMaxLiNumIdleBeacons); hdd_debug("Name = [gEnableBypass11d] Value = [%u] ", hdd_ctx->config->enableBypass11d); hdd_debug("Name = [gEnableDFSChnlScan] Value = [%u] ", @@ -6791,18 +6565,12 @@ void hdd_cfg_print(struct hdd_context *hdd_ctx) hdd_ctx->config->ignoreDynamicDtimInP2pMode); hdd_debug("Name = [enableRxSTBC] Value = [%u] ", hdd_ctx->config->enableRxSTBC); - hdd_debug("Name = [gEnableLpwrImgTransition] Value = [%u] ", - hdd_ctx->config->enableLpwrImgTransition); hdd_debug("Name = [gEnableSSR] Value = [%u] ", hdd_ctx->config->enableSSR); hdd_debug("Name = [gEnableDataStallDetection] Value = [%u] ", hdd_ctx->config->enable_data_stall_det); hdd_debug("Name = [gEnableVhtFor24GHzBand] Value = [%u] ", hdd_ctx->config->enableVhtFor24GHzBand); - hdd_debug("Name = [gEnableIbssHeartBeatOffload] Value = [%u] ", - hdd_ctx->config->enableIbssHeartBeatOffload); - hdd_debug("Name = [gAntennaDiversity] Value = [%u] ", - hdd_ctx->config->antennaDiversity); hdd_debug("Name = [gGoLinkMonitorPeriod] Value = [%u]", hdd_ctx->config->goLinkMonitorPeriod); hdd_debug("Name = [gApLinkMonitorPeriod] Value = [%u]", @@ -8204,12 +7972,6 @@ bool hdd_update_config_cfg(struct hdd_context *hdd_ctx) hdd_err("Couldn't pass on WNI_CFG_MAX_PS_POLL to CFG"); } - if (sme_cfg_set_int (hdd_ctx->hHal, WNI_CFG_LOW_GAIN_OVERRIDE, - config->fIsLowGainOverride) == QDF_STATUS_E_FAILURE) { - status = false; - hdd_err("Couldn't pass on WNI_CFG_LOW_GAIN_OVERRIDE to HAL"); - } - if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT, config->nDataInactivityTimeout) == QDF_STATUS_E_FAILURE) { status = false; @@ -8851,8 +8613,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx) hdd_set_power_save_offload_config(hdd_ctx); - smeConfig->csrConfig.csr11rConfig.IsFTResourceReqSupported = - pConfig->fFTResourceReqSupported; smeConfig->csrConfig.isFastRoamIniFeatureEnabled = pConfig->isFastRoamIniFeatureEnabled; smeConfig->csrConfig.csr_mawc_config.mawc_enabled = @@ -8935,7 +8695,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx) smeConfig->csrConfig.neighborRoamConfig.nhi_rssi_scan_rssi_ub = pConfig->nhi_rssi_scan_rssi_ub; smeConfig->csrConfig.addTSWhenACMIsOff = pConfig->AddTSWhenACMIsOff; - smeConfig->csrConfig.fValidateList = pConfig->fValidateScanList; smeConfig->csrConfig.allowDFSChannelRoam = pConfig->allowDFSChannelRoam; /* Enable/Disable MCC */ diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 706ef4e068..af04a58b6e 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -985,10 +985,6 @@ typedef struct tagCsrRoamConnectedProfile { #endif } tCsrRoamConnectedProfile; -typedef struct tagCsr11rConfigParams { - bool IsFTResourceReqSupported; -} tCsr11rConfigParams; - typedef struct tagCsrNeighborRoamConfigParams { uint32_t nNeighborScanTimerPeriod; @@ -1151,7 +1147,6 @@ typedef struct tagCsrConfigParam { uint32_t statsReqPeriodicity; /* stats request frequency from PE while in power save */ uint32_t statsReqPeriodicityInPS; - tCsr11rConfigParams csr11rConfig; #ifdef FEATURE_WLAN_ESE uint8_t isEseIniFeatureEnabled; #endif @@ -1167,12 +1162,6 @@ typedef struct tagCsrConfigParam { * This is mandated by WMM-AC certification */ bool addTSWhenACMIsOff; - /* - * channelPowerInfoList24 has been seen corrupted. Set this flag to true - * trying to detect when it happens. Adding this into code because we - * can't reproduce it easily. We don't know when it happens. - */ - bool fValidateList; /* * Customer wants to start with an active scan based on the default * country code. This optimization will minimize the driver load to diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index c0b56d8365..1a58d2ca5e 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -385,10 +385,6 @@ struct delstafor_sessionCmd { tSirMacAddr selfMacAddr; }; -struct csr_11rconfig { - bool IsFTResourceReqSupported; -}; - struct csr_neighbor_roamconfig { uint32_t nNeighborScanTimerPeriod; uint32_t neighbor_scan_min_timer_period; @@ -492,7 +488,6 @@ struct csr_config { uint32_t statsReqPeriodicityInPS;/* stats req freq while in powersave */ uint32_t dtimPeriod; bool ssidHidden; - struct csr_11rconfig csr11rConfig; uint8_t isFastRoamIniFeatureEnabled; struct mawc_params csr_mawc_config; uint8_t isRoamOffloadScanEnabled; @@ -517,7 +512,6 @@ struct csr_config { * that AC This is mandated by WMM-AC certification */ bool addTSWhenACMIsOff; - bool fValidateList; /* * Remove this code once SLM_Sessionization is supported * BMPS_WORKAROUND_NOT_NEEDED @@ -669,12 +663,6 @@ struct csr_scanstruct { * will use the most popular one (max count) */ uint8_t countryCodeElected[WNI_CFG_COUNTRY_CODE_LEN]; - /* - * channelPowerInfoList24 has been seen corrupted. Set this flag to true - * trying to detect when it happens. Adding this into code because we - * can't reproduce it easily. We don't know when it happens. - */ - bool fValidateList; /* * Customer wants to start with an active scan based on the default * country code. This optimization will minimize the driver load to diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 8c0acb4d11..3af9f1efad 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -651,8 +651,6 @@ QDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal, QDF_STATUS sme_update_is_ese_feature_enabled(tHalHandle hHal, uint8_t sessionId, const bool isEseIniFeatureEnabled); #endif /* FEATURE_WLAN_ESE */ -QDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, - bool fEnableFwRssiMonitoring); QDF_STATUS sme_set_roam_rescan_rssi_diff(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamRescanRssiDiff); diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 2648a85cad..04bea8fd43 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -7080,24 +7080,6 @@ QDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal, return status; } -/* - * sme_update_config_fw_rssi_monitoring() - enable/disable firmware RSSI - * Monitoring at runtime - * It is used at in the REG_DYNAMIC_VARIABLE macro definition of - * fEnableFwRssiMonitoring. - * This is a synchronous call - * - * hHal - The handle returned by mac_open. - * Return QDF_STATUS_SUCCESS - SME update fEnableFwRssiMonitoring. - * config successfully. - * Other status means SME is failed to update fEnableFwRssiMonitoring. - */ -QDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, - bool fEnableFwRssiMonitoring) -{ - return QDF_STATUS_SUCCESS; -} - /* * sme_set_roam_opportunistic_scan_threshold_diff() - * Update Opportunistic Scan threshold diff diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 60235f96e6..f3e93a7d38 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -1594,7 +1594,6 @@ static void init_config_param(tpAniSirGlobal pMac) CSR_MIN_GLOBAL_STAT_QUERY_PERIOD; pMac->roam.configParam.statsReqPeriodicityInPS = CSR_MIN_GLOBAL_STAT_QUERY_PERIOD_IN_BMPS; - pMac->roam.configParam.csr11rConfig.IsFTResourceReqSupported = 0; pMac->roam.configParam.neighborRoamConfig.nMaxNeighborRetries = 3; pMac->roam.configParam.neighborRoamConfig.nNeighborLookupRssiThreshold = 120; @@ -2808,12 +2807,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, !wlan_reg_11d_enabled_on_host(pMac->psoc)) csr_init_channel_power_list(pMac, &pParam->Csr11dinfo); - qdf_mem_copy(&pMac->roam.configParam.csr11rConfig, - &pParam->csr11rConfig, - sizeof(tCsr11rConfigParams)); - sme_debug("IsFTResourceReqSupp: %d", - pMac->roam.configParam.csr11rConfig. - IsFTResourceReqSupported); pMac->roam.configParam.isFastTransitionEnabled = pParam->isFastTransitionEnabled; pMac->roam.configParam.RoamRssiDiff = pParam->RoamRssiDiff; @@ -2902,7 +2895,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, nRoamBeaconRssiWeight); pMac->roam.configParam.addTSWhenACMIsOff = pParam->addTSWhenACMIsOff; - pMac->scan.fValidateList = pParam->fValidateList; pMac->scan.fEnableBypass11d = pParam->fEnableBypass11d; pMac->scan.fEnableDFSChnlScan = pParam->fEnableDFSChnlScan; pMac->scan.scanResultCfgAgingTime = pParam->scanCfgAgingTime; @@ -3236,7 +3228,6 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pParam->statsReqPeriodicity = cfg_params->statsReqPeriodicity; pParam->statsReqPeriodicityInPS = cfg_params->statsReqPeriodicityInPS; pParam->addTSWhenACMIsOff = cfg_params->addTSWhenACMIsOff; - pParam->fValidateList = cfg_params->fValidateList; pParam->fEnableBypass11d = pMac->scan.fEnableBypass11d; pParam->fEnableDFSChnlScan = pMac->scan.fEnableDFSChnlScan; pParam->fScanTwice = cfg_params->fScanTwice; @@ -3256,8 +3247,6 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pParam->enableVhtFor24GHz = cfg_params->enableVhtFor24GHz; pParam->ignore_peer_erp_info = cfg_params->ignore_peer_erp_info; pParam->enable2x2 = cfg_params->enable2x2; - qdf_mem_copy(&cfg_params->csr11rConfig, &pParam->csr11rConfig, - sizeof(tCsr11rConfigParams)); pParam->isFastTransitionEnabled = cfg_params->isFastTransitionEnabled; pParam->RoamRssiDiff = cfg_params->RoamRssiDiff; pParam->rssi_abs_thresh = cfg_params->rssi_abs_thresh;