From f231648955815362d514041da799642e17d1171e Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 15 Oct 2017 14:57:02 -0700 Subject: [PATCH] qcacld-3.0: Remove obsolete STA support for SIOCSIWRTS At one time the predecessor to the current driver was managed via wireless extensions, but now the driver is managed by cfg80211. The STA implementation of SIOCSIWRTS should no longer be used, so remove it. Change-Id: I2562e9b2e063810b98a7be15419468f09180ac57 CRs-Fixed: 2128985 --- core/hdd/src/wlan_hdd_wext.c | 69 +----------------------------------- 1 file changed, 1 insertion(+), 68 deletions(-) diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 77bcd2bd414f..32321c81030c 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -5219,73 +5219,6 @@ static int iw_set_bitrate(struct net_device *dev, return ret; } -/** - * __iw_set_rts_threshold() - SIOCSIWRTS ioctl handler - * @dev: device upon which the ioctl was received - * @info: ioctl request information - * @wrqu: ioctl request data - * @extra: ioctl extra data - * - * Return: 0 on success, non-zero on error - */ -static int __iw_set_rts_threshold(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); - tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter); - struct hdd_context *hdd_ctx; - int ret; - - ENTER_DEV(dev); - - hdd_ctx = WLAN_HDD_GET_CTX(adapter); - ret = wlan_hdd_validate_context(hdd_ctx); - if (0 != ret) - return ret; - - ret = hdd_check_standard_wext_control(hdd_ctx, info); - if (0 != ret) - return ret; - - if (wrqu->rts.value < WNI_CFG_RTS_THRESHOLD_STAMIN - || wrqu->rts.value > WNI_CFG_RTS_THRESHOLD_STAMAX) { - return -EINVAL; - } - - if (sme_cfg_set_int(hHal, WNI_CFG_RTS_THRESHOLD, wrqu->rts.value) != - QDF_STATUS_SUCCESS) { - hdd_err("failed to set ini parameter, WNI_CFG_RTS_THRESHOLD"); - return -EIO; - } - - EXIT(); - - return 0; -} - -/** - * iw_set_rts_threshold() - SSR wrapper for __iw_set_rts_threshold() - * @dev: pointer to net_device - * @info: pointer to iw_request_info - * @wrqu: pointer to iwreq_data - * @extra: pointer to extra ioctl payload - * - * Return: 0 on success, error number otherwise - */ -static int iw_set_rts_threshold(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - int ret; - - cds_ssr_protect(__func__); - ret = __iw_set_rts_threshold(dev, info, wrqu, extra); - cds_ssr_unprotect(__func__); - - return ret; -} - /** * __iw_get_range() - SIOCGIWRANGE ioctl handler * @dev: device upon which the ioctl was received @@ -11727,7 +11660,7 @@ static const iw_handler we_handler[] = { (iw_handler) NULL, /* -- hole -- */ (iw_handler) iw_set_bitrate, /* SIOCSIWRATE */ (iw_handler) iw_get_bitrate, /* SIOCGIWRATE */ - (iw_handler) iw_set_rts_threshold, /* SIOCSIWRTS */ + (iw_handler) NULL, /* SIOCSIWRTS */ (iw_handler) NULL, /* SIOCGIWRTS */ (iw_handler) NULL, /* SIOCSIWFRAG */ (iw_handler) NULL, /* SIOCGIWFRAG */