diff options
| author | Rongjun Chen <rongjun.chen@amlogic.com> | 2018-04-11 18:36:14 +0800 |
|---|---|---|
| committer | Rongjun Chen <rongjun.chen@amlogic.com> | 2018-04-11 18:46:21 +0800 |
| commit | 47cb572c30bd9d1a254f5ad7e3d956501fd18814 (patch) | |
| tree | 85ba12ffe1752b6e2258758de2d1a24fdd0bf3cc | |
| parent | dfb0f3aea55c1730301f1144468c8008a9e1090e (diff) | |
| download | dhd-driver-47cb572c30bd9d1a254f5ad7e3d956501fd18814.tar.gz | |
wifi: fix ap62x8 vts test fail
PD# 163673
fix ap62x8 vts test fail
Change-Id: I0f7210466167f7ebe24a40daf9ff9aa3ea53ccd4
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
| -rw-r--r--[-rwxr-xr-x] | bcmdhd.1.579.77.41.1.cn/dbus.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bcmdhd.1.579.77.41.1.cn/dbus_usb.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bcmdhd.1.579.77.41.1.cn/dbus_usb_linux.c | 0 | ||||
| -rw-r--r-- | bcmdhd.1.579.77.41.1.cn/dhd_common.c | 2 | ||||
| -rw-r--r-- | bcmdhd.1.579.77.41.1.cn/dhd_linux.c | 8 |
5 files changed, 3 insertions, 7 deletions
diff --git a/bcmdhd.1.579.77.41.1.cn/dbus.c b/bcmdhd.1.579.77.41.1.cn/dbus.c index 5e3b64c..5e3b64c 100755..100644 --- a/bcmdhd.1.579.77.41.1.cn/dbus.c +++ b/bcmdhd.1.579.77.41.1.cn/dbus.c diff --git a/bcmdhd.1.579.77.41.1.cn/dbus_usb.c b/bcmdhd.1.579.77.41.1.cn/dbus_usb.c index 237e016..237e016 100755..100644 --- a/bcmdhd.1.579.77.41.1.cn/dbus_usb.c +++ b/bcmdhd.1.579.77.41.1.cn/dbus_usb.c diff --git a/bcmdhd.1.579.77.41.1.cn/dbus_usb_linux.c b/bcmdhd.1.579.77.41.1.cn/dbus_usb_linux.c index 893760b..893760b 100755..100644 --- a/bcmdhd.1.579.77.41.1.cn/dbus_usb_linux.c +++ b/bcmdhd.1.579.77.41.1.cn/dbus_usb_linux.c diff --git a/bcmdhd.1.579.77.41.1.cn/dhd_common.c b/bcmdhd.1.579.77.41.1.cn/dhd_common.c index 46f270e..80fcbd9 100644 --- a/bcmdhd.1.579.77.41.1.cn/dhd_common.c +++ b/bcmdhd.1.579.77.41.1.cn/dhd_common.c @@ -655,7 +655,7 @@ int dhd_common_socram_dump(dhd_pub_t *dhdp) { #ifdef BCMDBUS - return -1; + return 0; #else return dhd_socram_dump(dhdp->bus); #endif /* BCMDBUS */ diff --git a/bcmdhd.1.579.77.41.1.cn/dhd_linux.c b/bcmdhd.1.579.77.41.1.cn/dhd_linux.c index 1add605..0f39328 100644 --- a/bcmdhd.1.579.77.41.1.cn/dhd_linux.c +++ b/bcmdhd.1.579.77.41.1.cn/dhd_linux.c @@ -12102,9 +12102,7 @@ dhd_preinit_ioctls(dhd_pub_t *dhd) bcmstrtok(&ptr, "\n", 0); strncpy(fw_version, buf, FW_VER_STR_LEN); fw_version[FW_VER_STR_LEN-1] = '\0'; -#if defined(BCMSDIO) || defined(BCMPCIE) dhd_set_version_info(dhd, buf); -#endif /* BCMSDIO || BCMPCIE */ #ifdef WRITE_WLANINFO sec_save_wlinfo(buf, EPI_VERSION_STR, dhd->info->nv_path, clm_version); #endif /* WRITE_WLANINFO */ @@ -17489,7 +17487,6 @@ bool dhd_os_check_if_up(dhd_pub_t *pub) return pub->up; } -#if defined(BCMSDIO) || defined(BCMPCIE) /* function to collect firmware, chip id and chip version info */ void dhd_set_version_info(dhd_pub_t *dhdp, char *fw) { @@ -17503,10 +17500,9 @@ void dhd_set_version_info(dhd_pub_t *dhdp, char *fw) return; i = snprintf(&info_string[i], sizeof(info_string) - i, - "\n Chip: %x Rev %x Pkg %x", dhd_bus_chip_id(dhdp), - dhd_bus_chiprev_id(dhdp), dhd_bus_chippkg_id(dhdp)); + "\n Chip: %x Rev %x", dhd_conf_get_chip(dhdp), + dhd_conf_get_chiprev(dhdp)); } -#endif /* BCMSDIO || BCMPCIE */ int dhd_ioctl_entry_local(struct net_device *net, wl_ioctl_t *ioc, int cmd) { |