From 75956d38f135fb3e9d9f6ceca2b7520c685dd1fa Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Sun, 15 Oct 2017 13:53:36 -0700
Subject: [PATCH] qcacld-3.0: Remove obsolete support for SIOCGIWFRAG

At one time the predecessor to the current driver was managed via
wireless extensions, but now the driver is managed by cfg80211. The
implementation of SIOCGIWFRAG should no longer be used, so remove it.

Change-Id: If83d63cea9f3f85a7c2597ae3cf43113548de3ba
CRs-Fixed: 2128982
---
 core/hdd/inc/wlan_hdd_wext.h    |  4 --
 core/hdd/src/wlan_hdd_hostapd.c |  2 +-
 core/hdd/src/wlan_hdd_wext.c    | 68 +--------------------------------
 3 files changed, 2 insertions(+), 72 deletions(-)

diff --git a/core/hdd/inc/wlan_hdd_wext.h b/core/hdd/inc/wlan_hdd_wext.h
index a24c8031ccba..dd40978bf796 100644
--- a/core/hdd/inc/wlan_hdd_wext.h
+++ b/core/hdd/inc/wlan_hdd_wext.h
@@ -280,10 +280,6 @@ int iw_get_rts_threshold(struct net_device *dev,
 			 struct iw_request_info *info,
 			 union iwreq_data *wrqu, char *extra);
 
-int iw_get_frag_threshold(struct net_device *dev,
-			  struct iw_request_info *info,
-			  union iwreq_data *wrqu, char *extra);
-
 extern int iw_set_essid(struct net_device *dev,
 			struct iw_request_info *info,
 			union iwreq_data *wrqu, char *extra);
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index 744c5d959203..221b7e3fe027 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -5512,7 +5512,7 @@ static const iw_handler hostapd_handler[] = {
 	(iw_handler) NULL,      /* SIOCSIWRTS */
 	(iw_handler) iw_get_rts_threshold,           /* SIOCGIWRTS */
 	(iw_handler) NULL,      /* SIOCSIWFRAG */
-	(iw_handler) iw_get_frag_threshold,          /* SIOCGIWFRAG */
+	(iw_handler) NULL,      /* SIOCGIWFRAG */
 	(iw_handler) NULL,      /* SIOCSIWTXPOW */
 	(iw_handler) NULL,      /* SIOCGIWTXPOW */
 	(iw_handler) NULL,      /* SIOCSIWRETRY */
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index 996125bd0d25..644c4b03f772 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -5352,72 +5352,6 @@ static int iw_set_rts_threshold(struct net_device *dev,
 	return ret;
 }
 
-/**
- * __iw_get_frag_threshold() - SIOCGIWFRAG 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_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 hal = WLAN_HDD_GET_HAL_CTX(adapter);
-	uint32_t threshold = 0;
-	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 (sme_cfg_get_int(hal, WNI_CFG_FRAGMENTATION_THRESHOLD, &threshold)
-	    != QDF_STATUS_SUCCESS) {
-		hdd_warn("failed to get ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD");
-		return -EIO;
-	}
-	wrqu->frag.value = threshold;
-
-	hdd_notice("Frag-Threshold=%d!!", wrqu->frag.value);
-
-	EXIT();
-
-	return 0;
-}
-
-/**
- * iw_get_frag_threshold() - SSR wrapper for __iw_get_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
- */
-int iw_get_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_get_frag_threshold(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
-
-	return ret;
-}
-
 /**
  * __iw_set_frag_threshold() - SIOCSIWFRAG ioctl handler
  * @dev: device upon which the ioctl was received
@@ -11930,7 +11864,7 @@ static const iw_handler we_handler[] = {
 	(iw_handler) iw_set_rts_threshold,      /* SIOCSIWRTS */
 	(iw_handler) iw_get_rts_threshold,      /* SIOCGIWRTS */
 	(iw_handler) iw_set_frag_threshold,     /* SIOCSIWFRAG */
-	(iw_handler) iw_get_frag_threshold,     /* SIOCGIWFRAG */
+	(iw_handler) NULL,      /* SIOCGIWFRAG */
 	(iw_handler) NULL,      /* SIOCSIWTXPOW */
 	(iw_handler) NULL,      /* SIOCGIWTXPOW */
 	(iw_handler) NULL,      /* SIOCSIWRETRY */