From 90448a812830116911afcfa0c8b176a986c08f73 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 15 Oct 2017 16:35:25 -0700 Subject: [PATCH] qcacld-3.0: Remove obsolete STA support for SIOCSIWNICKN 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 SIOCSIWNICKN should no longer be used, so remove it. Change-Id: Iab8a3e9fafc7a1c4c59bebd308b6b50a46b9228f CRs-Fixed: 2128989 --- 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 ec691820d158..05dfd2884894 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -5512,60 +5512,6 @@ void wlan_hdd_change_country_code_callback(void *context) complete(&adapter->change_country_code); } -/** - * __iw_set_nick() - SIOCSIWNICKN 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_nick(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 0; -} - -/** - * iw_set_nick() - SSR wrapper for __iw_set_nick - * @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_set_nick(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - int ret; - - cds_ssr_protect(__func__); - ret = __iw_set_nick(dev, info, wrqu, extra); - cds_ssr_unprotect(__func__); - - return ret; -} - /** * __iw_set_mlme() - SIOCSIWMLME ioctl handler * @dev: device upon which the ioctl was received @@ -11403,7 +11349,7 @@ static const iw_handler we_handler[] = { (iw_handler) NULL, /* SIOCGIWSCAN */ (iw_handler) iw_set_essid, /* SIOCSIWESSID */ (iw_handler) iw_get_essid, /* SIOCGIWESSID */ - (iw_handler) iw_set_nick, /* SIOCSIWNICKN */ + (iw_handler) NULL, /* SIOCSIWNICKN */ (iw_handler) NULL, /* SIOCGIWNICKN */ (iw_handler) NULL, /* -- hole -- */ (iw_handler) NULL, /* -- hole -- */