From 2443024a1aa680a6dd36d6d51006656bd5046d4a Mon Sep 17 00:00:00 2001
From: Abhishek Srivastava <cabsriv@codeaurora.org>
Date: Mon, 4 Mar 2019 14:26:55 +0530
Subject: [PATCH 1/2] wlan: Add default hostapd configuration file

If the hostapd configuration files are not present in /data/vendor/wifi,
copy it from the default file location /vendor/etc/hostapd
while starting softAP.

Change-Id: I3093e99cdd906d86035f9e8dbfdddb06ae9f7c80
CRs-Fixed: 2409527
---
 softap/sdk/qsap_api.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/softap/sdk/qsap_api.h b/softap/sdk/qsap_api.h
index c573a8d..a5fa644 100644
--- a/softap/sdk/qsap_api.h
+++ b/softap/sdk/qsap_api.h
@@ -99,16 +99,16 @@ enum error_val {
 #define CONFIG_FILE "/data/vendor/wifi/hostapd/hostapd.conf"
 
 /** Default configuration file path */
-#define DEFAULT_CONFIG_FILE_PATH "/system/etc/hostapd/hostapd_default.conf"
+#define DEFAULT_CONFIG_FILE_PATH "/vendor/etc/hostapd/hostapd_default.conf"
 
 /** Default Accept list file name */
-#define DEFAULT_ACCEPT_LIST_FILE_PATH "/system/etc/hostapd/hostapd.accept"
+#define DEFAULT_ACCEPT_LIST_FILE_PATH "/vendor/etc/hostapd/hostapd.accept"
 
 /** Accept list file name */
 #define ACCEPT_LIST_FILE "/data/vendor/wifi/hostapd/hostapd.accept"
 
 /** Default Deny list file name */
-#define DEFAULT_DENY_LIST_FILE_PATH "/system/etc/hostapd/hostapd.deny"
+#define DEFAULT_DENY_LIST_FILE_PATH "/vendor/etc/hostapd/hostapd.deny"
 
 /** Deny list file name */
 #define DENY_LIST_FILE "/data/vendor/wifi/hostapd/hostapd.deny"

From 62ae34e1a4e57615e46d8b0ad82b9e696c52b00c Mon Sep 17 00:00:00 2001
From: Hu Wang <huw@codeaurora.org>
Date: Thu, 31 Jan 2019 10:26:14 +0800
Subject: [PATCH 2/2] QSAP: Add support to set sae_require_mfp parameter

For SAE transtion mode, set sae_require_mfp to 1 to require MFP
for all associations using SAE.

CRs-Fixed: 2390790
Change-Id: I64bd35cbb77f6c9b64970c9a9db0a1bc3aeb2314
---
 softap/sdk/qsap_api.c | 2 ++
 softap/sdk/qsap_api.h | 1 +
 2 files changed, 3 insertions(+)

diff --git a/softap/sdk/qsap_api.c b/softap/sdk/qsap_api.c
index 1020ae3..f77a817 100644
--- a/softap/sdk/qsap_api.c
+++ b/softap/sdk/qsap_api.c
@@ -187,6 +187,7 @@ static struct Command cmd_list[eCMD_LAST] = {
     { "accept_mac_file",       NULL             },
     { "deny_mac_file",         NULL             },
     { "owe_transition_ifname", NULL             },
+    { "sae_require_mfp",       NULL             },
 
 };
 
@@ -1918,6 +1919,7 @@ static esap_cmd_t qsap_get_cmd_num(s8 *cName)
 
     for(i=0; i<eCMD_LAST; i++)     {
         len = strlen(cmd_list[i].name);
+
         if(!strncmp(cmd_list[i].name, cName, len)) {
             if((cName[len] == '=') || (cName[len] == '\0'))
                 return i;
diff --git a/softap/sdk/qsap_api.h b/softap/sdk/qsap_api.h
index a5fa644..659f5a5 100644
--- a/softap/sdk/qsap_api.h
+++ b/softap/sdk/qsap_api.h
@@ -359,6 +359,7 @@ typedef enum esap_cmd {
     eCMD_ACCEPT_MAC_FILE     = 81,
     eCMD_DENY_MAC_FILE       = 82,
     eCMD_OWE_TRANS_IFNAME    = 83,
+    eCMD_SAE_REQUIRE_MPF     = 84,
 
     eCMD_LAST     /** New command numbers should be added above this */
 } esap_cmd_t;