wifi: Modify for SU 7668 USB Dongle support
Test: pass
Change-Id: I0b87b16974d14061575766aa2f4a94d2b51751b4
CR-Id: AUTO00014958
Signed-off-by: Shengxi Xu <shengxi.xu@mediatek.com>
Reviewed-on: http://gerrit.mediatek.inc:8080/1447837
CheckPatch: Check Patch <srv_checkpatch@mediatek.com>
Reviewed-by: Jiehang Zheng <jiehang.zheng@mediatek.com>
Tested-by: Jiehang Zheng <jiehang.zheng@mediatek.com>
diff --git a/os/linux/gl_init.c b/os/linux/gl_init.c
index 4fa7c64..478e032 100644
--- a/os/linux/gl_init.c
+++ b/os/linux/gl_init.c
@@ -1965,6 +1965,12 @@
kalMemZero(pucConfigBuf, WLAN_CFG_FILE_BUF_SIZE);
u4ConfigReadLen = 0;
if (pucConfigBuf) {
+#if defined(_HIF_USB)
+ if (kalRequestFirmware("wifi_usb.cfg", pucConfigBuf,
+ WLAN_CFG_FILE_BUF_SIZE, &u4ConfigReadLen,
+ prAdapter->prGlueInfo->prDev) == 0) {
+ } else
+#endif
if (kalRequestFirmware("wifi.cfg", pucConfigBuf,
WLAN_CFG_FILE_BUF_SIZE, &u4ConfigReadLen, prAdapter->prGlueInfo->prDev) == 0) {
/* ToDo:: Nothing */
diff --git a/os/linux/gl_kal.c b/os/linux/gl_kal.c
index 84b9cba..d71dc8a 100644
--- a/os/linux/gl_kal.c
+++ b/os/linux/gl_kal.c
@@ -4969,7 +4969,8 @@
/*
* Directory: Root (/proc/net/wlan0)
*/
- pMetProcDir = proc_mkdir("wlan0", init_net.proc_net);
+ pMetProcDir = proc_mkdir(prGlueInfo->prDevHandler->name,
+ init_net.proc_net);
if (pMetProcDir == NULL)
return -ENOENT;
/*
diff --git a/os/linux/gl_proc.c b/os/linux/gl_proc.c
index 7afb708..31229d1 100644
--- a/os/linux/gl_proc.c
+++ b/os/linux/gl_proc.c
@@ -82,7 +82,11 @@
********************************************************************************
*/
#define PROC_MCR_ACCESS "mcr"
-#define PROC_ROOT_NAME "wlan"
+#if defined(_HIF_USB)
+#define PROC_ROOT_NAME "wlan_usb"
+#else
+#define PROC_ROOT_NAME "wlan"
+#endif
#if CFG_SUPPORT_DEBUG_FS
#define PROC_ROAM_PARAM "roam_param"