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

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Dmitry Shmidt
2011-06-01 15:17:48 -07:00
committed by Colin Cross
parent cf77d4ca64
commit 6db994e17e

View File

@@ -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