Эх сурвалжийг харах

qcacld-3.0: Remove obsolete McastBcastFilter ini feature

The McastBcastFilter configuration item is not being used, and support
is being dropped from the driver. Remove the McastBcastFilter setting
feature from the driver.

Change-Id: I6fc0e48e31c01ba2df73c51b3fd9ec2a84571541
CRs-Fixed: 2045284
Ravi Kumar Bokka 8 жил өмнө
parent
commit
91a8f3c649

+ 0 - 24
core/hdd/inc/wlan_hdd_cfg.h

@@ -4085,29 +4085,6 @@ enum station_keepalive_method {
 #define CFG_ROAM_BEACON_RSSI_WEIGHT_MAX                 (16)
 #define CFG_ROAM_BEACON_RSSI_WEIGHT_MAX                 (16)
 #define CFG_ROAM_BEACON_RSSI_WEIGHT_DEFAULT             (14)
 #define CFG_ROAM_BEACON_RSSI_WEIGHT_DEFAULT             (14)
 
 
-/*
- * <ini>
- * McastBcastFilter - Filters Mcast/Bcast Rx packets completely
- * @Min: 0
- * @Max: 3
- * @Default: 0
- *
- * This ini is used to send default NULL frame to AP
- *
- * Related: None
- *
- * Supported Feature: STA
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-
-#define CFG_MCAST_BCAST_FILTER_SETTING_NAME          "McastBcastFilter"
-#define CFG_MCAST_BCAST_FILTER_SETTING_MIN           (0)
-#define CFG_MCAST_BCAST_FILTER_SETTING_MAX           (3)
-#define CFG_MCAST_BCAST_FILTER_SETTING_DEFAULT       (0)
-
 /*
 /*
  * <ini>
  * <ini>
  * gDynamicPSPollvalue - Set dynamic PSpoll value
  * gDynamicPSPollvalue - Set dynamic PSpoll value
@@ -10559,7 +10536,6 @@ struct hdd_config {
 	 * single replay counter for all TID
 	 * single replay counter for all TID
 	 */
 	 */
 	bool bSingleTidRc;
 	bool bSingleTidRc;
-	uint8_t mcastBcastFilterSetting;
 	bool fhostArpOffload;
 	bool fhostArpOffload;
 	enum pmo_hw_filter_mode hw_filter_mode;
 	enum pmo_hw_filter_mode hw_filter_mode;
 	bool ssdp;
 	bool ssdp;

+ 0 - 15
core/hdd/src/wlan_hdd_cfg.c

@@ -1461,13 +1461,6 @@ struct reg_table_entry g_registry_table[] = {
 		     CFG_QOS_WMM_BURST_SIZE_DEFN_MIN,
 		     CFG_QOS_WMM_BURST_SIZE_DEFN_MIN,
 		     CFG_QOS_WMM_BURST_SIZE_DEFN_MAX),
 		     CFG_QOS_WMM_BURST_SIZE_DEFN_MAX),
 
 
-	REG_VARIABLE(CFG_MCAST_BCAST_FILTER_SETTING_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, mcastBcastFilterSetting,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_MCAST_BCAST_FILTER_SETTING_DEFAULT,
-		     CFG_MCAST_BCAST_FILTER_SETTING_MIN,
-		     CFG_MCAST_BCAST_FILTER_SETTING_MAX),
-
 	REG_VARIABLE(CFG_ENABLE_HOST_ARPOFFLOAD_NAME, WLAN_PARAM_Integer,
 	REG_VARIABLE(CFG_ENABLE_HOST_ARPOFFLOAD_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, fhostArpOffload,
 		     struct hdd_config, fhostArpOffload,
 		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
 		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -5442,8 +5435,6 @@ void hdd_cfg_print(hdd_context_t *pHddCtx)
 
 
 	hdd_info("Name = [DelayedTriggerFrmInt] Value = [%u] ",
 	hdd_info("Name = [DelayedTriggerFrmInt] Value = [%u] ",
 		  pHddCtx->config->DelayedTriggerFrmInt);
 		  pHddCtx->config->DelayedTriggerFrmInt);
-	hdd_info("Name = [mcastBcastFilterSetting] Value = [%u] ",
-		  pHddCtx->config->mcastBcastFilterSetting);
 	hdd_info("Name = [fhostArpOffload] Value = [%u] ",
 	hdd_info("Name = [fhostArpOffload] Value = [%u] ",
 		  pHddCtx->config->fhostArpOffload);
 		  pHddCtx->config->fhostArpOffload);
 	hdd_info("Name = [%s] Value = [%u]",
 	hdd_info("Name = [%s] Value = [%u]",
@@ -6821,12 +6812,6 @@ bool hdd_update_config_cfg(hdd_context_t *hdd_ctx)
 		hdd_err("Couldn't pass on WNI_CFG_GO_LINK_MONITOR_TIMEOUT to CFG");
 		hdd_err("Couldn't pass on WNI_CFG_GO_LINK_MONITOR_TIMEOUT to CFG");
 	}
 	}
 
 
-	if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_MCAST_BCAST_FILTER_SETTING,
-		    config->mcastBcastFilterSetting) == QDF_STATUS_E_FAILURE) {
-		status = false;
-		hdd_err("Couldn't pass on WNI_CFG_MCAST_BCAST_FILTER_SETTING to CFG");
-	}
-
 	if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_SINGLE_TID_RC,
 	if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_SINGLE_TID_RC,
 		    config->bSingleTidRc) == QDF_STATUS_E_FAILURE) {
 		    config->bSingleTidRc) == QDF_STATUS_E_FAILURE) {
 		status = false;
 		status = false;

+ 0 - 2
core/hdd/src/wlan_hdd_main.c

@@ -7577,8 +7577,6 @@ static hdd_context_t *hdd_context_create(struct device *dev)
 		  hdd_ctx->config->timer_multiplier);
 		  hdd_ctx->config->timer_multiplier);
 	qdf_timer_set_multiplier(hdd_ctx->config->timer_multiplier);
 	qdf_timer_set_multiplier(hdd_ctx->config->timer_multiplier);
 
 
-	hdd_debug("Setting configuredMcastBcastFilter: %d",
-		   hdd_ctx->config->mcastBcastFilterSetting);
 
 
 	if (hdd_ctx->config->fhostNSOffload)
 	if (hdd_ctx->config->fhostNSOffload)
 		hdd_ctx->ns_offload_enable = true;
 		hdd_ctx->ns_offload_enable = true;

+ 0 - 5
core/mac/inc/wni_cfg.h

@@ -205,7 +205,6 @@ enum {
 	WNI_CFG_WPS_DEVICE_PASSWORD_ID,
 	WNI_CFG_WPS_DEVICE_PASSWORD_ID,
 	WNI_CFG_LOW_GAIN_OVERRIDE,
 	WNI_CFG_LOW_GAIN_OVERRIDE,
 	WNI_CFG_SINGLE_TID_RC,
 	WNI_CFG_SINGLE_TID_RC,
-	WNI_CFG_MCAST_BCAST_FILTER_SETTING,
 	WNI_CFG_DYNAMIC_PS_POLL_VALUE,
 	WNI_CFG_DYNAMIC_PS_POLL_VALUE,
 	WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT,
 	WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT,
 	WNI_CFG_TELE_BCN_WAKEUP_EN,
 	WNI_CFG_TELE_BCN_WAKEUP_EN,
@@ -1157,10 +1156,6 @@ enum {
 #define WNI_CFG_SINGLE_TID_RC_STAMAX    1
 #define WNI_CFG_SINGLE_TID_RC_STAMAX    1
 #define WNI_CFG_SINGLE_TID_RC_STADEF    1
 #define WNI_CFG_SINGLE_TID_RC_STADEF    1
 
 
-#define WNI_CFG_MCAST_BCAST_FILTER_SETTING_STAMIN    0
-#define WNI_CFG_MCAST_BCAST_FILTER_SETTING_STAMAX    3
-#define WNI_CFG_MCAST_BCAST_FILTER_SETTING_STADEF    0
-
 #define WNI_CFG_DYNAMIC_PS_POLL_VALUE_STAMIN    0
 #define WNI_CFG_DYNAMIC_PS_POLL_VALUE_STAMIN    0
 #define WNI_CFG_DYNAMIC_PS_POLL_VALUE_STAMAX    255
 #define WNI_CFG_DYNAMIC_PS_POLL_VALUE_STAMAX    255
 #define WNI_CFG_DYNAMIC_PS_POLL_VALUE_STADEF    0
 #define WNI_CFG_DYNAMIC_PS_POLL_VALUE_STADEF    0

+ 0 - 13
core/mac/src/cfg/cfgUtil/cfg.txt

@@ -3922,19 +3922,6 @@ V    RW    NP
 NONE
 NONE
 0    1    1
 0    1    1
 
 
-*
-*  MCAST BCAST filter Setting
-*  0: No filter, 1: Block Mcast, 2: Block Bcast, 3: Block Mcast and Bcast
-*
-
-WNI_CFG_MCAST_BCAST_FILTER_SETTING    I    4    7
-V    RW    NP
-HAL
-0    3    0
-V    RW    NP
-HAL
-0    3    0
-
 *
 *
 *  BTC DHCP No of Bt slots to block
 *  BTC DHCP No of Bt slots to block
 *
 *

+ 0 - 6
core/mac/src/cfg/cfg_proc_msg.c

@@ -916,12 +916,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_SINGLE_TID_RC_STAMIN,
 	WNI_CFG_SINGLE_TID_RC_STAMIN,
 	WNI_CFG_SINGLE_TID_RC_STAMAX,
 	WNI_CFG_SINGLE_TID_RC_STAMAX,
 	WNI_CFG_SINGLE_TID_RC_STADEF},
 	WNI_CFG_SINGLE_TID_RC_STADEF},
-	{WNI_CFG_MCAST_BCAST_FILTER_SETTING,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
-	CFG_CTL_NTF_HAL,
-	WNI_CFG_MCAST_BCAST_FILTER_SETTING_STAMIN,
-	WNI_CFG_MCAST_BCAST_FILTER_SETTING_STAMAX,
-	WNI_CFG_MCAST_BCAST_FILTER_SETTING_STADEF},
 	{WNI_CFG_DYNAMIC_PS_POLL_VALUE,
 	{WNI_CFG_DYNAMIC_PS_POLL_VALUE,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
 	CFG_CTL_NTF_HAL,
 	CFG_CTL_NTF_HAL,