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

qcacld-3.0: Remove obsolete standard_wext_control INI item

Previously the INI item standard_wext_control was used to control
whether or not standard wireless extensions (wext) ioctls were allowed
to be called. But since they were obsolete, all support for standard
wireless extensions ioctls have been removed from the driver. As a
result this INI items is also obsolete, so remove it.

Change-Id: I608f54fc13df691fe3d3774fdecdbfa9e0b553f8
CRs-Fixed: 2211124
Jeff Johnson 7 жил өмнө
parent
commit
618764fc36

+ 1 - 30
core/hdd/inc/wlan_hdd_cfg.h

@@ -10503,7 +10503,7 @@ enum dot11p_mode {
  *
  * enum hdd_wext_control is used to enable coarse grained control on
  * wireless extensions ioctls. This control is used by configuration
- * items standard_wext_control and private_wext_control.
+ * item private_wext_control.
  *
  */
 enum hdd_wext_control {
@@ -10512,34 +10512,6 @@ enum hdd_wext_control {
 	hdd_wext_enabled = 2,
 };
 
-/*
- * <ini>
- * standard_wext_control - Standard wireless extensions control
- * @Min: 0
- * @Max: 2
- * @Default: 0
- *
- * Values are per enum hdd_wext_control.
- *
- * This ini is used to control access to standard wireless extensions
- * ioctls SIOCSIWCOMMIT (0x8B00) thru SIOCSIWPMKSA (0x8B36). The
- * functionality originally provided by these ioctls has been
- * completely superceeded by the functionality of cfg80211, and hence
- * by default support for these ioctls is disabled.
- *
- * Related: None
- *
- * Supported Feature: All
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_STANDARD_WEXT_CONTROL_NAME          "standard_wext_control"
-#define CFG_STANDARD_WEXT_CONTROL_MIN           (hdd_wext_disabled)
-#define CFG_STANDARD_WEXT_CONTROL_MAX           (hdd_wext_enabled)
-#define CFG_STANDARD_WEXT_CONTROL_DEFAULT       (hdd_wext_disabled)
-
 /*
  * <ini>
  * private_wext_control - Private wireless extensions control
@@ -15114,7 +15086,6 @@ struct hdd_config {
 	uint16_t wow_pulse_interval_high;
 	uint16_t wow_pulse_interval_low;
 #endif
-	enum hdd_wext_control standard_wext_control;
 	enum hdd_wext_control private_wext_control;
 	bool sap_internal_restart;
 	enum restart_beaconing_on_ch_avoid_rule

+ 0 - 18
core/hdd/inc/wlan_hdd_wext.h

@@ -349,24 +349,6 @@ int wlan_hdd_get_link_speed(struct hdd_adapter *adapter, uint32_t *link_speed);
 
 struct iw_request_info;
 
-/**
- * hdd_check_standard_wext_control() - Check to see if standard
- *      wireless extensions ioctls are allowed
- * @hdd_ctx: Global HDD context
- * @info: Wireless extensions ioctl information passed by the kernel
- *
- * This function will examine the "standard_wext_control" configuration
- * item to determine whether or not standard wireless extensions ioctls
- * are allowed.
- *
- * Return: 0 if the ioctl is allowed to be processed, -ENOTSUPP if the
- * ioctls have been disabled. Note that in addition to returning
- * status, this function will log a message if the ioctls are disabled
- * or deprecated.
- */
-int hdd_check_standard_wext_control(struct hdd_context *hdd_ctx,
-				    struct iw_request_info *info);
-
 /**
  * hdd_check_private_wext_control() - Check to see if private
  *      wireless extensions ioctls are allowed

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

@@ -4494,12 +4494,6 @@ struct reg_table_entry g_registry_table[] = {
 		CFG_MAX_SCHED_SCAN_PLAN_ITRNS_MIN,
 		CFG_MAX_SCHED_SCAN_PLAN_ITRNS_MAX),
 
-	REG_VARIABLE(CFG_STANDARD_WEXT_CONTROL_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, standard_wext_control,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_STANDARD_WEXT_CONTROL_DEFAULT,
-		     CFG_STANDARD_WEXT_CONTROL_MIN,
-		     CFG_STANDARD_WEXT_CONTROL_MAX),
 	REG_VARIABLE(CFG_PRIVATE_WEXT_CONTROL_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, private_wext_control,
 		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,

+ 0 - 7
core/hdd/src/wlan_hdd_wext.c

@@ -3009,13 +3009,6 @@ static int hdd_check_wext_control(enum hdd_wext_control wext_control,
 	}
 }
 
-int hdd_check_standard_wext_control(struct hdd_context *hdd_ctx,
-				    struct iw_request_info *info)
-{
-	return hdd_check_wext_control(hdd_ctx->config->standard_wext_control,
-				      info);
-}
-
 int hdd_check_private_wext_control(struct hdd_context *hdd_ctx,
 				   struct iw_request_info *info)
 {