From 22ba2a427237f2ae29e31309aa2d0b41ad23eb89 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 15 Oct 2017 15:53:39 -0700 Subject: [PATCH] qcacld-3.0: Remove obsolete STA support for SIOCGIWNICKN 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 SIOCGIWNICKN should no longer be used, so remove it. Change-Id: I20f78d9cb52187676e543e90f5ffe19176fe8bc3 CRs-Fixed: 2128988 --- 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 cb5293013ff0..ec691820d158 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -5566,60 +5566,6 @@ static int iw_set_nick(struct net_device *dev, return ret; } -/** - * __iw_get_nick() - SIOCGIWNICKN 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_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_get_nick() - SSR wrapper for __iw_get_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_get_nick(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - int ret; - - cds_ssr_protect(__func__); - ret = __iw_get_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 @@ -11458,7 +11404,7 @@ static const iw_handler we_handler[] = { (iw_handler) iw_set_essid, /* SIOCSIWESSID */ (iw_handler) iw_get_essid, /* SIOCGIWESSID */ (iw_handler) iw_set_nick, /* SIOCSIWNICKN */ - (iw_handler) iw_get_nick, /* SIOCGIWNICKN */ + (iw_handler) NULL, /* SIOCGIWNICKN */ (iw_handler) NULL, /* -- hole -- */ (iw_handler) NULL, /* -- hole -- */ (iw_handler) NULL, /* SIOCSIWRATE */