From 918d35e0b6baaa26962765699c0abc38df3a7f71 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 15 Oct 2017 12:50:26 -0700 Subject: [PATCH] qcacld-3.0: Remove obsolete STA support for SIOCGIWTXPOW 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 SIOCGIWTXPOW should no longer be used, so remove it. Change-Id: If5e0a007182e0a25344d27d653b87d22327398fd CRs-Fixed: 2128590 --- core/hdd/src/wlan_hdd_wext.c | 63 +----------------------------------- 1 file changed, 1 insertion(+), 62 deletions(-) diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 474383fe1d58..65d73b50b874 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -5022,67 +5022,6 @@ static int iw_get_freq(struct net_device *dev, struct iw_request_info *info, return ret; } -/** - * __iw_get_tx_power() - SIOCGIWTXPOW 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_get_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); - struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); - int ret; - - ENTER_DEV(dev); - - 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 (eConnectionState_Associated != sta_ctx->conn_info.connState) { - wrqu->txpower.value = 0; - return 0; - } - wlan_hdd_get_class_astats(adapter); - wrqu->txpower.value = adapter->hdd_stats.ClassA_stat.max_pwr; - - return 0; -} - -/** - * iw_get_tx_power() - SSR wrapper for __iw_get_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_get_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_get_tx_power(dev, info, wrqu, extra); - cds_ssr_unprotect(__func__); - - return ret; -} - /** * __iw_set_tx_power() - SIOCSIWTXPOW ioctl handler * @dev: device upon which the ioctl was received @@ -12055,7 +11994,7 @@ static const iw_handler we_handler[] = { (iw_handler) iw_set_frag_threshold, /* SIOCSIWFRAG */ (iw_handler) iw_get_frag_threshold, /* SIOCGIWFRAG */ (iw_handler) iw_set_tx_power, /* SIOCSIWTXPOW */ - (iw_handler) iw_get_tx_power, /* SIOCGIWTXPOW */ + (iw_handler) NULL, /* SIOCGIWTXPOW */ (iw_handler) NULL, /* SIOCSIWRETRY */ (iw_handler) NULL, /* SIOCGIWRETRY */ (iw_handler) NULL, /* SIOCSIWENCODE */