From 458db7cae69d194fa59dbc25f327d76237345f1d Mon Sep 17 00:00:00 2001
From: Yunsen Wang <yunsenw@codeaurora.org>
Date: Tue, 15 Nov 2011 21:23:32 -0800
Subject: [PATCH] system/qcom:Use wlan config path from android property
 wlan.driver.config

wlan.driver.config android property points to the correct wlan driver
config file. This config file is used to get/set config items related to
wlan driver as indicated from userspace through Qualcomm SoftAP SDK
commands.

Change-Id: I82efd922c72a77b281f007ba95db7042f5ac5e82
CRs-fixed: 315065
---
 softap/sdk/qsap.c     |  3 +++
 softap/sdk/qsap_api.c | 11 +++++++++++
 softap/sdk/qsap_api.h |  1 +
 3 files changed, 15 insertions(+)

diff --git a/softap/sdk/qsap.c b/softap/sdk/qsap.c
index c077fb8..80cff04 100755
--- a/softap/sdk/qsap.c
+++ b/softap/sdk/qsap.c
@@ -446,6 +446,9 @@ s32 wifi_qsap_start_softap()
         qsap_del_ctrl_iface();
     }
 
+    /* Ensure correct path for ini file name */
+    qsap_set_ini_filename();
+
     while(retry--) {
         /* May be the configuration file is corrupted or not available, */
         /* copy the default configuration file                          */
diff --git a/softap/sdk/qsap_api.c b/softap/sdk/qsap_api.c
index 2526745..771ff06 100755
--- a/softap/sdk/qsap_api.c
+++ b/softap/sdk/qsap_api.c
@@ -171,6 +171,7 @@ char *hw_mode[HW_MODE_UNKNOWN] = {
 /** configuration file path */
 char *pconffile = CONFIG_FILE; 
 char *fIni = INI_FILE;
+s8 ini_file[64] = {0};
 
 /**
  * @brief
@@ -2939,3 +2940,13 @@ void check_for_configuration_files(void)
 
     return;
 }
+
+void qsap_set_ini_filename(void)
+{
+    if (property_get("wlan.driver.config", ini_file, NULL)) {
+        fIni = ini_file;
+        LOGE("INI FILE PROP PRESENT %s\n", fIni);
+    } else
+        LOGE("INI FILE PROP NOT PRESENT: Use default path %s\n", fIni);
+    return;
+}
diff --git a/softap/sdk/qsap_api.h b/softap/sdk/qsap_api.h
index 763d4f6..4e1062c 100644
--- a/softap/sdk/qsap_api.h
+++ b/softap/sdk/qsap_api.h
@@ -535,6 +535,7 @@ int qsapsetSoftap(int argc, char *argv[]);
 void qsap_del_ctrl_iface(void);
 s16 wifi_qsap_reset_to_default(s8 *pcfgfile, s8 *pdefault);
 void check_for_configuration_files(void);
+void qsap_set_ini_filename(void);
 
 #if __cplusplus
 };  // extern "C"