net: wireless: bcmdhd: Fix config FW and NVRAM path

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/drivers/net/wireless/bcmdhd/dhd_common.c b/drivers/net/wireless/bcmdhd/dhd_common.c
index b1d9e7c87601b07752d6965369af345a1519cbfe..9791250d3eca5feca264c310527de14d8df1d3dd 100644 (file)
--- a/drivers/net/wireless/bcmdhd/dhd_common.c
+++ b/drivers/net/wireless/bcmdhd/dhd_common.c
@@ -202,16 +202,16 @@ dhd_common_init(osl_t *osh)
        memset(cmn, 0, sizeof(dhd_cmn_t));
        cmn->osh = osh;
 
-#ifdef CONFIG_BCM4329_FW_PATH
-       bcm_strncpy_s(fw_path, sizeof(fw_path), CONFIG_BCM4329_FW_PATH, MOD_PARAM_PATHLEN-1);
-#else /* CONFIG_BCM4329_FW_PATH */
+#ifdef CONFIG_BCMDHD_FW_PATH
+       bcm_strncpy_s(fw_path, sizeof(fw_path), CONFIG_BCMDHD_FW_PATH, MOD_PARAM_PATHLEN-1);
+#else
        fw_path[0] = '\0';
-#endif /* CONFIG_BCM4329_FW_PATH */
-#ifdef CONFIG_BCM4329_NVRAM_PATH
-       bcm_strncpy_s(nv_path, sizeof(nv_path), CONFIG_BCM4329_NVRAM_PATH, MOD_PARAM_PATHLEN-1);
-#else /* CONFIG_BCM4329_NVRAM_PATH */
+#endif /* CONFIG_BCMDHD_FW_PATH */
+#ifdef CONFIG_BCMDHD_NVRAM_PATH
+       bcm_strncpy_s(nv_path, sizeof(nv_path), CONFIG_BCMDHD_NVRAM_PATH, MOD_PARAM_PATHLEN-1);
+#else
        nv_path[0] = '\0';
-#endif /* CONFIG_BCM4329_NVRAM_PATH */
+#endif /* CONFIG_BCMDHD_NVRAM_PATH */
 #ifdef SOFTAP
        fw_path2[0] = '\0';
 #endif