diff options
| -rw-r--r-- | core/hdd/inc/qc_sap_ioctl.h | 5 | ||||
| -rw-r--r-- | core/hdd/inc/wlan_hdd_cfg.h | 27 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_cfg.c | 92 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_cfg80211.c | 5 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_hostapd.c | 158 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_wext.c | 64 |
6 files changed, 4 insertions, 347 deletions
diff --git a/core/hdd/inc/qc_sap_ioctl.h b/core/hdd/inc/qc_sap_ioctl.h index 30609bafb4b8..5ecc103ca449 100644 --- a/core/hdd/inc/qc_sap_ioctl.h +++ b/core/hdd/inc/qc_sap_ioctl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -105,10 +105,8 @@ struct channel_list_info { #define QCSAP_IOCTL_PRIV_SET_THREE_INT_GET_NONE (SIOCIWFIRSTPRIV + 15) #define WE_SET_WLAN_DBG 1 #define WE_SET_DP_TRACE 2 -#define WE_SET_SAP_CHANNELS 3 #define QCSAP_IOCTL_PRIV_SET_VAR_INT_GET_NONE (SIOCIWFIRSTPRIV + 16) #define WE_UNIT_TEST_CMD 7 -#define QCSAP_IOCTL_SET_CHANNEL_RANGE (SIOCIWFIRSTPRIV + 17) #define WE_P2P_NOA_CMD 2 @@ -185,7 +183,6 @@ enum { QCSAP_PARAM_CLR_ACL = 4, QCSAP_PARAM_ACL_MODE, QCSAP_PARAM_HIDE_SSID, - QCSAP_PARAM_AUTO_CHANNEL, QCSAP_PARAM_SET_MC_RATE, QCSAP_PARAM_SET_TXRX_FW_STATS, QCSAP_PARAM_SET_MCC_CHANNEL_LATENCY, diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index f1c99ae261bb..865528047a0e 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -6151,30 +6151,6 @@ enum hdd_link_speed_rpt_type { #define CFG_VC_MODE_BITMAP_DEFAULT (0x00000005) /* - * Driver Force ACS is reintroduced for android SAP legacy configuration method. - * If Driver force acs is enabled, channel/ hw config from hostapd is ignored. - * Driver uses INI params dot11Mode, channel bonding mode and vht chan width - * to derive ACS HW mode and operating BW. - * - * Non android platforms shall not use force ACS method and rely on hostapd - * driven ACS method for concurrent SAP ACS configuration, OBSS etc. - */ -#define CFG_FORCE_SAP_ACS "gApAutoChannelSelection" -#define CFG_FORCE_SAP_ACS_MIN (0) -#define CFG_FORCE_SAP_ACS_MAX (1) -#define CFG_FORCE_SAP_ACS_DEFAULT (0) - -#define CFG_FORCE_SAP_ACS_START_CH "gAPChannelSelectStartChannel" -#define CFG_FORCE_SAP_ACS_START_CH_MIN (0) -#define CFG_FORCE_SAP_ACS_START_CH_MAX (0xFF) -#define CFG_FORCE_SAP_ACS_START_CH_DEFAULT (1) - -#define CFG_FORCE_SAP_ACS_END_CH "gAPChannelSelectEndChannel" -#define CFG_FORCE_SAP_ACS_END_CH_MIN (0) -#define CFG_FORCE_SAP_ACS_END_CH_MAX (0xFF) -#define CFG_FORCE_SAP_ACS_END_CH_DEFAULT (11) - -/* * <ini> * gEnableSAPManadatoryChanList - Enable SAP Mandatory channel list * Options. @@ -15374,9 +15350,6 @@ struct hdd_config { #endif /* Flag to indicate crash inject enabled or not */ bool crash_inject_enabled; - uint8_t force_sap_acs; - uint8_t force_sap_acs_st_ch; - uint8_t force_sap_acs_end_ch; uint8_t enable_sap_mandatory_chan_list; int32_t dfsRadarPriMultiplier; uint8_t reorderOffloadSupport; diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 5eafff8580ad..740a1bd478e8 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -589,92 +589,6 @@ struct reg_table_entry g_registry_table[] = { CFG_VC_MODE_BITMAP_MIN, CFG_VC_MODE_BITMAP_MAX), - -/* - * <ini> - * gApAutoChannelSelection - Force ACS from ini - * @Min: 0 - * @Max: 1 - * @Default: 0 - * - * This ini is used to set to enable force acs from driver. - * If enabled, channel/ hw config from hostapd is ignored. - * Driver uses INI params dot11Mode, channel bonding mode and vht chan width - * to derive ACS HW mode and operating BW. - * - * Non android platforms shall not use force ACS method and rely on hostapd - * driven ACS method for concurrent SAP ACS configuration, OBSS etc. - * - * Related: Only applicable if gCoalesingInIBSS is 0 - * - * Supported Feature: SAP - * - * Usage: Internal/External - * - * </ini> - */ - REG_VARIABLE(CFG_FORCE_SAP_ACS, WLAN_PARAM_Integer, - struct hdd_config, force_sap_acs, - VAR_FLAGS_DYNAMIC_CFG | - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_FORCE_SAP_ACS_DEFAULT, - CFG_FORCE_SAP_ACS_MIN, - CFG_FORCE_SAP_ACS_MAX), - -/* - * <ini> - * gAPChannelSelectStartChannel - start channel for ACS - * @Min: 0 - * @Max: 0xFF - * @Default: 1 - * - * This ini is used to set start channel for ACS. - * ACS scan will choose channel between force_sap_acs_st_ch - * and force_sap_acs_end_ch - * - * Related: Only applicable gAPChannelSelectEndChannel is set - * - * Supported Feature: SAP - * - * Usage: Internal/External - * - * </ini> - */ - REG_VARIABLE(CFG_FORCE_SAP_ACS_START_CH, WLAN_PARAM_Integer, - struct hdd_config, force_sap_acs_st_ch, - VAR_FLAGS_DYNAMIC_CFG | - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_FORCE_SAP_ACS_START_CH_DEFAULT, - CFG_FORCE_SAP_ACS_START_CH_MIN, - CFG_FORCE_SAP_ACS_START_CH_MAX), - -/* - * <ini> - * gAPChannelSelectEndChannel - end channel for ACS - * @Min: 0 - * @Max: 0xFF - * @Default: 11 - * - * This ini is used to set end channel for ACS. - * ACS scan will choose channel between force_sap_acs_st_ch - * and force_sap_acs_end_ch - * - * Related: Only applicable if gAPChannelSelectStartChannel is set - * - * Supported Feature: SAP - * - * Usage: Internal/External - * - * </ini> - */ - REG_VARIABLE(CFG_FORCE_SAP_ACS_END_CH, WLAN_PARAM_Integer, - struct hdd_config, force_sap_acs_end_ch, - VAR_FLAGS_DYNAMIC_CFG | - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_FORCE_SAP_ACS_END_CH_DEFAULT, - CFG_FORCE_SAP_ACS_END_CH_MIN, - CFG_FORCE_SAP_ACS_END_CH_MAX), - REG_VARIABLE(CFG_ENABLE_SAP_MANDATORY_CHAN_LIST, WLAN_PARAM_Integer, struct hdd_config, enable_sap_mandatory_chan_list, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -6697,12 +6611,6 @@ void hdd_cfg_print(hdd_context_t *pHddCtx) pHddCtx->config->apProtection); hdd_debug("Name = [gEnableApOBSSProt] value = [%u]", pHddCtx->config->apOBSSProtEnabled); - hdd_debug("Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS, - pHddCtx->config->force_sap_acs); - hdd_debug("Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_START_CH, - pHddCtx->config->force_sap_acs_st_ch); - hdd_debug("Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_END_CH, - pHddCtx->config->force_sap_acs_end_ch); #ifdef FEATURE_AP_MCC_CH_AVOIDANCE hdd_debug("Name = [sap_channel_avoidance] value = [%u]", pHddCtx->config->sap_channel_avoidance); diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 9d611e490e1a..5c9f22d54a47 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -1613,11 +1613,6 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy, return -EPERM; } - if (hdd_ctx->config->force_sap_acs) { - hdd_err("Hostapd ACS rejected as Driver ACS enabled"); - return -EPERM; - } - ret = wlan_hdd_validate_context(hdd_ctx); if (ret) return ret; diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 6247905a92f5..90f911364c87 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -2464,13 +2464,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pHddApCtx->sapConfig.acs_cfg.ch_width = pSapEvent->sapevt.sap_ch_selected.ch_width; - /* Indicate operating channel change to hostapd - * only for non driver override acs - */ - if (pHostapdAdapter->device_mode == QDF_SAP_MODE && - pHddCtx->config->force_sap_acs) { - return QDF_STATUS_SUCCESS; - } sap_ch_param.ch_width = pSapEvent->sapevt.sap_ch_selected.ch_width; sap_ch_param.center_freq_seg0 = @@ -2559,9 +2552,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pSapEvent->sapevt.sap_ch_selected.vht_seg1_center_ch; pHddApCtx->sapConfig.acs_cfg.ch_width = pSapEvent->sapevt.sap_ch_selected.ch_width; - /* send vendor event to hostapd only for hostapd based acs*/ - if (!pHddCtx->config->force_sap_acs) - wlan_hdd_cfg80211_acs_ch_select_evt(pHostapdAdapter); + wlan_hdd_cfg80211_acs_ch_select_evt(pHostapdAdapter); qdf_atomic_set( &pHostapdAdapter->sessionCtx.ap.acs_in_progress, 0); return QDF_STATUS_SUCCESS; @@ -3240,14 +3231,6 @@ static __iw_softap_setparam(struct net_device *dev, ret = -EINVAL; } break; - case QCSAP_PARAM_AUTO_CHANNEL: - if (set_value == 0 || set_value == 1) - (WLAN_HDD_GET_CTX( - pHostapdAdapter))->config->force_sap_acs = - set_value; - else - ret = -EINVAL; - break; case QCSAP_PARAM_CONC_SYSTEM_PREF: hdd_debug("New preference: %d", set_value); if (!((set_value >= CFG_CONC_SYSTEM_PREF_MIN) && @@ -3929,11 +3912,6 @@ static __iw_softap_getparam(struct net_device *dev, } break; - case QCSAP_PARAM_AUTO_CHANNEL: - *value = (WLAN_HDD_GET_CTX - (pHostapdAdapter))->config->force_sap_acs; - break; - case QCSAP_PARAM_GET_WLAN_DBG: { qdf_trace_display(); @@ -4602,45 +4580,6 @@ static int iw_get_char_setnone(struct net_device *dev, return ret; } -static int wlan_hdd_set_force_acs_ch_range(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - hdd_adapter_t *adapter = (netdev_priv(dev)); - hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - int *value = (int *)extra; - - ENTER_DEV(dev); - - if (!capable(CAP_NET_ADMIN)) { - hdd_err("permission check failed"); - return -EPERM; - } - - if (wlan_hdd_validate_operation_channel(adapter, value[0]) != - QDF_STATUS_SUCCESS || - wlan_hdd_validate_operation_channel(adapter, value[1]) != - QDF_STATUS_SUCCESS) { - return -EINVAL; - } - hdd_ctx->config->force_sap_acs_st_ch = value[0]; - hdd_ctx->config->force_sap_acs_end_ch = value[1]; - - return 0; -} - -static int iw_softap_set_force_acs_ch_range(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - int ret; - - cds_ssr_protect(__func__); - ret = wlan_hdd_set_force_acs_ch_range(dev, info, wrqu, extra); - cds_ssr_unprotect(__func__); - return ret; -} - static int __iw_get_channel_list(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) @@ -5901,10 +5840,6 @@ static const struct iw_priv_args hostapd_private_args[] = { IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "setChanChange" }, { - QCSAP_PARAM_AUTO_CHANNEL, - IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, - "setAutoChannel" - }, { QCSAP_PARAM_CONC_SYSTEM_PREF, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "setConcSysPref" @@ -6078,9 +6013,6 @@ static const struct iw_priv_args hostapd_private_args[] = { QCSAP_PARAM_GET_WLAN_DBG, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getwlandbg" }, { - QCSAP_PARAM_AUTO_CHANNEL, 0, - IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getAutoChannel" - }, { QCSAP_GTX_BWMASK, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_gtxBWMask" }, { @@ -6219,9 +6151,6 @@ static const struct iw_priv_args hostapd_private_args[] = { { WE_SET_WLAN_DBG, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 3, 0, "setwlandbg" - }, { - WE_SET_SAP_CHANNELS, - IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 3, 0, "setsapchannels" } , /* handlers for sub-ioctl */ @@ -6372,8 +6301,6 @@ static const iw_handler hostapd_private[] = { [QCSAP_IOCTL_PRIV_SET_VAR_INT_GET_NONE - SIOCIWFIRSTPRIV] = iw_set_var_ints_getnone, - [QCSAP_IOCTL_SET_CHANNEL_RANGE - SIOCIWFIRSTPRIV] = - iw_softap_set_force_acs_ch_range, [QCSAP_IOCTL_MODIFY_ACL - SIOCIWFIRSTPRIV] = iw_softap_modify_acl, [QCSAP_IOCTL_GET_CHANNEL_LIST - SIOCIWFIRSTPRIV] = @@ -7600,10 +7527,6 @@ static int wlan_hdd_setup_driver_overrides(hdd_adapter_t *ap_adapter) tsap_Config_t *sap_cfg = &ap_adapter->sessionCtx.ap.sapConfig; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter); - if (ap_adapter->device_mode == QDF_SAP_MODE && - hdd_ctx->config->force_sap_acs) - goto setup_acs_overrides; - /* Fixed channel 11AC override: * 11AC override in qcacld is introduced for following reasons: * 1. P2P GO also follows start_bss and since p2p GO could not be @@ -7655,82 +7578,6 @@ static int wlan_hdd_setup_driver_overrides(hdd_adapter_t *ap_adapter) sap_cfg->sec_ch, &sap_cfg->ch_params); return 0; - -setup_acs_overrides: - hdd_debug("** Driver force ACS override **"); - - sap_cfg->channel = AUTO_CHANNEL_SELECT; - sap_cfg->acs_cfg.acs_mode = true; - sap_cfg->acs_cfg.start_ch = hdd_ctx->config->force_sap_acs_st_ch; - sap_cfg->acs_cfg.end_ch = hdd_ctx->config->force_sap_acs_end_ch; - - if (sap_cfg->acs_cfg.start_ch > sap_cfg->acs_cfg.end_ch) { - hdd_err("Driver force ACS start ch (%d) > end ch (%d)", - sap_cfg->acs_cfg.start_ch, sap_cfg->acs_cfg.end_ch); - return -EINVAL; - } - - /* Derive ACS HW mode */ - sap_cfg->SapHw_mode = hdd_cfg_xlate_to_csr_phy_mode( - hdd_ctx->config->dot11Mode); - if (sap_cfg->SapHw_mode == eCSR_DOT11_MODE_AUTO) - sap_cfg->SapHw_mode = eCSR_DOT11_MODE_11ac; - - if (((ap_adapter->device_mode == QDF_SAP_MODE) && - (hdd_ctx->config->sap_force_11n_for_11ac)) || - ((ap_adapter->device_mode == QDF_P2P_GO_MODE) && - (hdd_ctx->config->go_force_11n_for_11ac))) { - if (sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11ac || - sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11ac_ONLY) - sap_cfg->SapHw_mode = eCSR_DOT11_MODE_11n; - } - - if ((sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11b || - sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11g || - sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11g_ONLY) && - sap_cfg->acs_cfg.start_ch > 14) { - hdd_err("Invalid ACS HW Mode %d + CH range <%d - %d>", - sap_cfg->SapHw_mode, sap_cfg->acs_cfg.start_ch, - sap_cfg->acs_cfg.end_ch); - return -EINVAL; - } - sap_cfg->acs_cfg.hw_mode = sap_cfg->SapHw_mode; - - /* Derive ACS BW */ - sap_cfg->ch_width_orig = eHT_CHANNEL_WIDTH_20MHZ; - if (sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11ac || - sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11ac_ONLY) { - - sap_cfg->ch_width_orig = hdd_ctx->config->vhtChannelWidth; - /* VHT in 2.4G depends on gChannelBondingMode24GHz INI param */ - if (sap_cfg->acs_cfg.end_ch <= 14) - sap_cfg->ch_width_orig = - hdd_ctx->config->nChannelBondingMode24GHz ? - eHT_CHANNEL_WIDTH_40MHZ : - eHT_CHANNEL_WIDTH_20MHZ; - } - - if (sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11n || - sap_cfg->SapHw_mode == eCSR_DOT11_MODE_11n_ONLY) { - if (sap_cfg->acs_cfg.end_ch <= 14) - sap_cfg->ch_width_orig = - hdd_ctx->config->nChannelBondingMode24GHz ? - eHT_CHANNEL_WIDTH_40MHZ : - eHT_CHANNEL_WIDTH_20MHZ; - else - sap_cfg->ch_width_orig = - hdd_ctx->config->nChannelBondingMode5GHz ? - eHT_CHANNEL_WIDTH_40MHZ : - eHT_CHANNEL_WIDTH_20MHZ; - } - sap_cfg->acs_cfg.ch_width = sap_cfg->ch_width_orig; - - hdd_debug("Force ACS Config: HW_MODE: %d ACS_BW: %d", - sap_cfg->acs_cfg.hw_mode, sap_cfg->acs_cfg.ch_width); - hdd_debug("Force ACS Config: ST_CH: %d END_CH: %d", - sap_cfg->acs_cfg.start_ch, sap_cfg->acs_cfg.end_ch); - - return 0; } #ifdef WLAN_FEATURE_UDP_RESPONSE_OFFLOAD @@ -8508,8 +8355,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, acl_entry++; } } - if (!pHddCtx->config->force_sap_acs && - !(ssid && qdf_str_len(PRE_CAC_SSID) == ssid_len && + if (!(ssid && qdf_str_len(PRE_CAC_SSID) == ssid_len && (0 == qdf_mem_cmp(ssid, PRE_CAC_SSID, ssid_len)))) { pIe = wlan_hdd_cfg80211_get_ie_ptr( &pMgmt_frame->u.beacon.variable[0], diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 8f9293ab184d..1269a0978f5c 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -605,25 +605,7 @@ static const struct ccp_freq_chan_map freq_chan_map[] = { * </ioctl> */ #define WE_PPS_RSSI_CHECK 53 -/* - * <ioctl> - * setAutoChannel - set ACS enable/disable - * - * @INPUT: None - * - * @OUTPUT: None - * - * This IOCTL is used to set SAP ACS eanble/disable - * - * @E.g: iwpriv wlan0 setAutoChannel 0 - * - * Supported Feature: SAP - * - * Usage: Internal/External - * - * </ioctl> - */ -#define WE_SET_SAP_AUTO_CHANNEL_SELECTION 54 + /* * <ioctl> * htsmps - Sets the htsmps @@ -1065,11 +1047,8 @@ static const struct ccp_freq_chan_map freq_chan_map[] = { /* Private ioctls and their sub-ioctls */ #define WLAN_PRIV_SET_NONE_GET_INT (SIOCIWFIRSTPRIV + 1) #define WE_GET_11D_STATE 1 -#define WE_SET_SAP_CHANNELS 3 #define WE_GET_WLAN_DBG 4 #define WE_GET_MAX_ASSOC 6 -/* 7 is unused */ -#define WE_GET_SAP_AUTO_CHANNEL_SELECTION 8 /* * <ioctl> @@ -1774,7 +1753,6 @@ static const struct ccp_freq_chan_map freq_chan_map[] = { #define WLAN_PRIV_SET_THREE_INT_GET_NONE (SIOCIWFIRSTPRIV + 4) #define WE_SET_WLAN_DBG 1 #define WE_SET_DP_TRACE 2 -#define WE_SET_SAP_CHANNELS 3 #define WE_SET_FW_TEST 4 /* Private ioctls and their sub-ioctls */ @@ -7450,14 +7428,6 @@ static int __iw_setint_getnone(struct net_device *dev, break; } - case WE_SET_SAP_AUTO_CHANNEL_SELECTION: - if (set_value == 0 || set_value == 1) - (WLAN_HDD_GET_CTX(pAdapter))->config->force_sap_acs = - set_value; - else - ret = -EINVAL; - break; - case WE_SET_DATA_INACTIVITY_TO: if (!hHal) { ret = -EINVAL; @@ -8861,10 +8831,6 @@ static int __iw_setnone_getint(struct net_device *dev, } break; } - case WE_GET_SAP_AUTO_CHANNEL_SELECTION: - *value = (WLAN_HDD_GET_CTX( - pAdapter))->config->force_sap_acs; - break; case WE_GET_CONCURRENCY_MODE: { @@ -9392,21 +9358,6 @@ static int __iw_set_three_ints_getnone(struct net_device *dev, qdf_dp_trace_set_value(value[1], value[2], value[3]); break; - /* value[3] the acs band is not required as start and end channels are - * enough but this cmd is maintained under set three ints for historic - * reasons. - */ - case WE_SET_SAP_CHANNELS: - if (wlan_hdd_validate_operation_channel(pAdapter, value[1]) != - QDF_STATUS_SUCCESS || - wlan_hdd_validate_operation_channel(pAdapter, - value[2]) != QDF_STATUS_SUCCESS) { - ret = -EINVAL; - } else { - hdd_ctx->config->force_sap_acs_st_ch = value[1]; - hdd_ctx->config->force_sap_acs_end_ch = value[2]; - } - break; case WE_SET_DUAL_MAC_SCAN_CONFIG: hdd_debug("Ioctl to set dual mac scan config"); if (hdd_ctx->config->dual_mac_feature_disable == @@ -12551,10 +12502,6 @@ static const struct iw_priv_args we_private_args[] = { 0, "setMaxAssoc"}, - {WE_SET_SAP_AUTO_CHANNEL_SELECTION, - IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, - "setAutoChannel" }, - {WE_SET_SCAN_DISABLE, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, @@ -12986,10 +12933,6 @@ static const struct iw_priv_args we_private_args[] = { IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getMaxAssoc"}, - {WE_GET_SAP_AUTO_CHANNEL_SELECTION, - 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, - "getAutoChannel" }, - {WE_GET_CONCURRENCY_MODE, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, @@ -13270,11 +13213,6 @@ static const struct iw_priv_args we_private_args[] = { 0, "set_dp_trace"}, - {WE_SET_SAP_CHANNELS, - IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 3, - 0, - "setsapchannels"}, - {WE_SET_FW_TEST, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 3, 0, "fw_test"}, |