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
This commit is contained in:
@@ -446,6 +446,9 @@ s32 wifi_qsap_start_softap()
|
|||||||
qsap_del_ctrl_iface();
|
qsap_del_ctrl_iface();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Ensure correct path for ini file name */
|
||||||
|
qsap_set_ini_filename();
|
||||||
|
|
||||||
while(retry--) {
|
while(retry--) {
|
||||||
/* May be the configuration file is corrupted or not available, */
|
/* May be the configuration file is corrupted or not available, */
|
||||||
/* copy the default configuration file */
|
/* copy the default configuration file */
|
||||||
|
|||||||
@@ -171,6 +171,7 @@ char *hw_mode[HW_MODE_UNKNOWN] = {
|
|||||||
/** configuration file path */
|
/** configuration file path */
|
||||||
char *pconffile = CONFIG_FILE;
|
char *pconffile = CONFIG_FILE;
|
||||||
char *fIni = INI_FILE;
|
char *fIni = INI_FILE;
|
||||||
|
s8 ini_file[64] = {0};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief
|
* @brief
|
||||||
@@ -2939,3 +2940,13 @@ void check_for_configuration_files(void)
|
|||||||
|
|
||||||
return;
|
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;
|
||||||
|
}
|
||||||
|
|||||||
@@ -535,6 +535,7 @@ int qsapsetSoftap(int argc, char *argv[]);
|
|||||||
void qsap_del_ctrl_iface(void);
|
void qsap_del_ctrl_iface(void);
|
||||||
s16 wifi_qsap_reset_to_default(s8 *pcfgfile, s8 *pdefault);
|
s16 wifi_qsap_reset_to_default(s8 *pcfgfile, s8 *pdefault);
|
||||||
void check_for_configuration_files(void);
|
void check_for_configuration_files(void);
|
||||||
|
void qsap_set_ini_filename(void);
|
||||||
|
|
||||||
#if __cplusplus
|
#if __cplusplus
|
||||||
}; // extern "C"
|
}; // extern "C"
|
||||||
|
|||||||
Reference in New Issue
Block a user