bcmdhd wifi: nvram auto recognize for AP6335

diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
index 1e8e577ed51e36b8f85838a9be385233ff66eda2..bbfe2a892da4c563fcf621559877dc9d9c032429 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
@@ -485,7 +485,6 @@ dhd_conf_set_fw_name_by_chip(dhd_pub_t *dhd, char *fw_path, char *nv_path)
                case BCM4335_CHIP_ID:\r
                        if (chiprev == BCM4335A0_CHIP_REV)\r
                                strcpy(&fw_path[i+1], bcm4339a0_ag_fw_name[fw_type]);\r
-                       strcpy(&nv_path[i+1], "nvram_AP6335.txt");\r
                        break;\r
                case BCM4345_CHIP_ID:\r
                        if (chiprev == BCM43455C0_CHIP_REV)\r
@@ -494,6 +493,7 @@ dhd_conf_set_fw_name_by_chip(dhd_pub_t *dhd, char *fw_path, char *nv_path)
                case BCM4339_CHIP_ID:\r
                        if (chiprev == BCM4339A0_CHIP_REV)\r
                                strcpy(&fw_path[i+1], bcm4339a0_ag_fw_name[fw_type]);\r
+                       strcpy(&nv_path[i+1], "nvram_AP6335.txt");
                        break;\r
                case BCM4354_CHIP_ID:\r
                        if (chiprev == BCM4354A1_CHIP_REV)\r
@@ -511,7 +511,7 @@ dhd_conf_set_fw_name_by_chip(dhd_pub_t *dhd, char *fw_path, char *nv_path)
 #endif\r
        }\r
 \r
-       printf("%s: firmware_path=%s\n", __FUNCTION__, fw_path);\r
+       printk("%s: firmware_path=%s,nv_path=%s\n", __FUNCTION__, fw_path, nv_path);\r
 }\r
 \r
 void\r