From 744676f562ea5063581e7c92ef7b835a58f58671 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 15 Oct 2017 12:56:16 -0700 Subject: [PATCH] qcacld-3.0: Remove obsolete STA support for SIOCSIWTXPOW 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 SIOCSIWTXPOW should no longer be used, so remove it. Change-Id: I77abd4b621a2541e9b745f3a48cd533dc293bf72 CRs-Fixed: 2128591 --- core/hdd/src/wlan_hdd_wext.c | 64 +----------------------------------- 1 file changed, 1 insertion(+), 63 deletions(-) diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 65d73b50b874..996125bd0d25 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -5022,68 +5022,6 @@ static int iw_get_freq(struct net_device *dev, struct iw_request_info *info, return ret; } -/** - * __iw_set_tx_power() - SIOCSIWTXPOW 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_tx_power(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 (sme_cfg_set_int(hHal, WNI_CFG_CURRENT_TX_POWER_LEVEL, - wrqu->txpower.value) != QDF_STATUS_SUCCESS) { - hdd_err("WNI_CFG_CURRENT_TX_POWER_LEVEL failed"); - return -EIO; - } - - EXIT(); - - return 0; -} - -/** - * iw_set_tx_power() - SSR wrapper for __iw_set_tx_power() - * @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_tx_power(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - int ret; - - cds_ssr_protect(__func__); - ret = __iw_set_tx_power(dev, info, wrqu, extra); - cds_ssr_unprotect(__func__); - - return ret; -} - /** * __iw_get_bitrate() - SIOCGIWRATE ioctl handler * @dev: device upon which the ioctl was received @@ -11993,7 +11931,7 @@ static const iw_handler we_handler[] = { (iw_handler) iw_get_rts_threshold, /* SIOCGIWRTS */ (iw_handler) iw_set_frag_threshold, /* SIOCSIWFRAG */ (iw_handler) iw_get_frag_threshold, /* SIOCGIWFRAG */ - (iw_handler) iw_set_tx_power, /* SIOCSIWTXPOW */ + (iw_handler) NULL, /* SIOCSIWTXPOW */ (iw_handler) NULL, /* SIOCGIWTXPOW */ (iw_handler) NULL, /* SIOCSIWRETRY */ (iw_handler) NULL, /* SIOCGIWRETRY */