From 14c3f069e5e88fd39f07d29efb3075ae48d38e07 Mon Sep 17 00:00:00 2001
From: bings <bings@codeaurora.org>
Date: Tue, 17 Sep 2019 05:11:03 +0800
Subject: [PATCH] qcacld-3.0: Add support to configure HE SGI for SAP

Add support for configuring HE SGI for SAP.

Change-Id: I57f4f7b592d3f518fe74ce58294543a4b8567ab8
CRs-Fixed: 2527533
---
 core/hdd/inc/wlan_hdd_wext.h         |  9 +++++++++
 core/hdd/src/wlan_hdd_hostapd_wext.c | 11 +----------
 core/hdd/src/wlan_hdd_wext.c         |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/hdd/inc/wlan_hdd_wext.h b/core/hdd/inc/wlan_hdd_wext.h
index 4d8984046707..708ac2424abc 100644
--- a/core/hdd/inc/wlan_hdd_wext.h
+++ b/core/hdd/inc/wlan_hdd_wext.h
@@ -213,6 +213,15 @@ int hdd_get_ldpc(struct hdd_adapter *adapter, int *value);
  */
 int hdd_set_ldpc(struct hdd_adapter *adapter, int value);
 
+/**
+ * hdd_we_set_short_gi() - Set adapter Short GI
+ * @adapter: adapter being modified
+ * @sgi: new sgi value
+ *
+ * Return: 0 on success, negative errno on failure
+ */
+int hdd_we_set_short_gi(struct hdd_adapter *adapter, int sgi);
+
 int hdd_get_tx_stbc(struct hdd_adapter *adapter, int *value);
 
 /**
diff --git a/core/hdd/src/wlan_hdd_hostapd_wext.c b/core/hdd/src/wlan_hdd_hostapd_wext.c
index 5a6036156acd..873b8c68dab7 100644
--- a/core/hdd/src/wlan_hdd_hostapd_wext.c
+++ b/core/hdd/src/wlan_hdd_hostapd_wext.c
@@ -777,16 +777,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCASAP_SHORT_GI:
 	{
 		hdd_debug("QCASAP_SET_SHORT_GI val %d", set_value);
-		/*
-		 * wma_cli_set_command should be called instead of
-		 * sme_update_ht_config since SGI is used for HT/HE.
-		 * This should be refactored.
-		 *
-		 * SGI is same for 20MHZ and 40MHZ.
-		 */
-		ret = sme_update_ht_config(mac_handle, adapter->vdev_id,
-					   WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ,
-					   set_value);
+		ret = hdd_we_set_short_gi(adapter, set_value);
 		if (ret)
 			hdd_err("Failed to set ShortGI value ret: %d", ret);
 		break;
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index 5115ae93e17d..1df68e2c92b5 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -4651,7 +4651,7 @@ static int hdd_we_set_nss(struct hdd_adapter *adapter, int nss)
 	return qdf_status_to_os_return(status);
 }
 
-static int hdd_we_set_short_gi(struct hdd_adapter *adapter, int sgi)
+int hdd_we_set_short_gi(struct hdd_adapter *adapter, int sgi)
 {
 	mac_handle_t mac_handle = adapter->hdd_ctx->mac_handle;
 	int errno;