From 40d701029ed0aa9786c2b47d08ca6146ebbecfc2 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 15 Oct 2017 14:39:01 -0700 Subject: [PATCH] qcacld-3.0: Remove obsolete STA support for SIOCSIWFRAG 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 SIOCSIWFRAG should no longer be used, so remove it. Change-Id: I25e2102a9d97b583783df4480f3fc81fc2a1d202 CRs-Fixed: 2128983 --- core/hdd/src/wlan_hdd_wext.c | 70 +----------------------------------- 1 file changed, 1 insertion(+), 69 deletions(-) diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 644c4b03f772..f15bf044b99f 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -5352,74 +5352,6 @@ static int iw_set_rts_threshold(struct net_device *dev, return ret; } -/** - * __iw_set_frag_threshold() - SIOCSIWFRAG 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_frag_threshold(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 (wrqu->frag.value < WNI_CFG_FRAGMENTATION_THRESHOLD_STAMIN - || wrqu->frag.value > WNI_CFG_FRAGMENTATION_THRESHOLD_STAMAX) { - return -EINVAL; - } - - if (sme_cfg_set_int - (hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, wrqu->frag.value) - != QDF_STATUS_SUCCESS) { - hdd_err("WNI_CFG_FRAGMENTATION_THRESHOLD failed"); - return -EIO; - } - - EXIT(); - - return 0; -} - -/** - * iw_set_frag_threshold() - SSR wrapper for __iw_set_frag_threshold() - * @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_frag_threshold(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - int ret; - - cds_ssr_protect(__func__); - ret = __iw_set_frag_threshold(dev, info, wrqu, extra); - cds_ssr_unprotect(__func__); - - return ret; -} - /** * __iw_get_range() - SIOCGIWRANGE ioctl handler * @dev: device upon which the ioctl was received @@ -11863,7 +11795,7 @@ static const iw_handler we_handler[] = { (iw_handler) iw_get_bitrate, /* SIOCGIWRATE */ (iw_handler) iw_set_rts_threshold, /* SIOCSIWRTS */ (iw_handler) iw_get_rts_threshold, /* SIOCGIWRTS */ - (iw_handler) iw_set_frag_threshold, /* SIOCSIWFRAG */ + (iw_handler) NULL, /* SIOCSIWFRAG */ (iw_handler) NULL, /* SIOCGIWFRAG */ (iw_handler) NULL, /* SIOCSIWTXPOW */ (iw_handler) NULL, /* SIOCGIWTXPOW */