From 5ff101722a3473971e7401160ae1a51adc6c5510 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Sun, 15 Oct 2017 18:45:27 -0700
Subject: [PATCH] qcacld-3.0: Remove obsolete STA support for SIOCSIWAP

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 SIOCSIWAP should no longer be used, so remove
it.

Change-Id: I996ae1c023e844b54f2c1fe4fcbefeaf3e8bf878
CRs-Fixed: 2128994
---
 core/hdd/inc/wlan_hdd_wext.h  |  4 ---
 core/hdd/src/wlan_hdd_assoc.c | 67 -----------------------------------
 core/hdd/src/wlan_hdd_wext.c  |  2 +-
 3 files changed, 1 insertion(+), 72 deletions(-)

diff --git a/core/hdd/inc/wlan_hdd_wext.h b/core/hdd/inc/wlan_hdd_wext.h
index 42fafdbe7097..97643ff93ef4 100644
--- a/core/hdd/inc/wlan_hdd_wext.h
+++ b/core/hdd/inc/wlan_hdd_wext.h
@@ -276,10 +276,6 @@ extern void hdd_wlan_get_stats(struct hdd_adapter *adapter, uint16_t *length,
 extern void hdd_wlan_list_fw_profile(uint16_t *length,
 			       char *buffer, uint16_t buf_len);
 
-extern int iw_set_ap_address(struct net_device *dev,
-			     struct iw_request_info *info,
-			     union iwreq_data *wrqu, char *extra);
-
 extern int iw_set_var_ints_getnone(struct net_device *dev,
 				   struct iw_request_info *info,
 				   union iwreq_data *wrqu, char *extra);
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index fabc7cf03558..a4928d25443a 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -5295,70 +5295,3 @@ int hdd_set_csr_auth_type(struct hdd_adapter *adapter,
 
 	return 0;
 }
-
-/**
- * __iw_set_ap_address() - set ap address
- * @dev: pointer to the net device
- * @info: pointer to the iw request info
- * @wrqu: pointer to iwreq_data
- * @extra: pointer to the data
- *
- * This function updates the HDD global station context connection info
- * BSSID with the MAC address received from the wpa_supplicant.
- *
- * Return: 0 on success, error number otherwise
- */
-static int __iw_set_ap_address(struct net_device *dev,
-		      struct iw_request_info *info,
-		      union iwreq_data *wrqu, char *extra)
-{
-
-	struct hdd_adapter *adapter;
-	struct hdd_context *hdd_ctx;
-	struct hdd_station_ctx *sta_ctx =
-		WLAN_HDD_GET_STATION_CTX_PTR(WLAN_HDD_GET_PRIV_PTR(dev));
-	uint8_t *pMacAddress = NULL;
-	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 (ret)
-		return ret;
-
-	ret = hdd_check_standard_wext_control(hdd_ctx, info);
-	if (0 != ret)
-		return ret;
-
-	pMacAddress = (uint8_t *) wrqu->ap_addr.sa_data;
-	hdd_debug(" " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pMacAddress));
-	qdf_mem_copy(sta_ctx->conn_info.bssId.bytes, pMacAddress,
-		     sizeof(struct qdf_mac_addr));
-	EXIT();
-
-	return 0;
-}
-
-/**
- * iw_set_ap_address() - set ap addresses callback function
- * @dev: Pointer to the net device.
- * @info: Pointer to the iw_request_info.
- * @wrqu: Pointer to the iwreq_data.
- * @extra: Pointer to the data.
- *
- * Return: 0 for success, error number on failure.
- */
-int iw_set_ap_address(struct net_device *dev, struct iw_request_info *info,
-			union iwreq_data *wrqu, char *extra)
-{
-	int ret;
-
-	cds_ssr_protect(__func__);
-	ret = __iw_set_ap_address(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
-
-	return ret;
-}
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index 87f0625d20c4..001f2869c057 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -11231,7 +11231,7 @@ static const iw_handler we_handler[] = {
 	(iw_handler) NULL,      /* SIOCGIWSPY */
 	(iw_handler) NULL,      /* SIOCSIWTHRSPY */
 	(iw_handler) NULL,      /* SIOCGIWTHRSPY */
-	(iw_handler) iw_set_ap_address, /* SIOCSIWAP */
+	(iw_handler) NULL,      /* SIOCSIWAP */
 	(iw_handler) NULL,      /* SIOCGIWAP */
 	(iw_handler) NULL,      /* SIOCSIWMLME */
 	(iw_handler) NULL,      /* SIOCGIWAPLIST */