From 330d8dc9ced75f0a910c1bdd51f2f6d655843f57 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 15 Oct 2017 11:43:13 -0700 Subject: [PATCH] qcacld-3.0: Remove obsolete STA support for SIOCGIWPOWER 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 SIOCGIWPOWER performs no useful actions and should no longer be used, so remove it. Change-Id: I3226f15ae9685eab83e8dc3ee9771da0ad3df5fc CRs-Fixed: 2128583 --- core/hdd/src/wlan_hdd_wext.c | 56 +----------------------------------- 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 58bf6edfb7ac..88a94381e7c0 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -5705,60 +5705,6 @@ static int iw_set_frag_threshold(struct net_device *dev, return ret; } -/** - * __iw_get_power_mode() - SIOCGIWPOWER 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_power_mode(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - struct hdd_adapter *adapter; - struct hdd_context *hdd_ctx; - int ret; - - ENTER_DEV(dev); - - adapter = WLAN_HDD_GET_PRIV_PTR(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; - - return -EOPNOTSUPP; -} - -/** - * iw_get_power_mode() - SSR wrapper function for __iw_get_power_mode - * @dev: pointer to net_device - * @info: pointer to iw_request_info - * @wrqu: pointer to iwreq_data - * @extra: extra - * - * Return: 0 on success, error number otherwise - */ -static int iw_get_power_mode(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - int ret; - - cds_ssr_protect(__func__); - ret = __iw_get_power_mode(dev, info, wrqu, extra); - cds_ssr_unprotect(__func__); - - return ret; -} - /** * __iw_set_power_mode() - SIOCSIWPOWER ioctl handler * @dev: device upon which the ioctl was received @@ -12622,7 +12568,7 @@ static const iw_handler we_handler[] = { (iw_handler) iw_set_encode, /* SIOCSIWENCODE */ (iw_handler) iw_get_encode, /* SIOCGIWENCODE */ (iw_handler) iw_set_power_mode, /* SIOCSIWPOWER */ - (iw_handler) iw_get_power_mode, /* SIOCGIWPOWER */ + (iw_handler) NULL, /* SIOCGIWPOWER */ (iw_handler) NULL, /* -- hole -- */ (iw_handler) NULL, /* -- hole -- */ (iw_handler) NULL, /* SIOCSIWGENIE */