diff options
| author | DerTeufel <dominik-kassel@gmx.de> | 2014-12-25 21:03:34 +0100 |
|---|---|---|
| committer | rogersb11 <brettrogers11@gmail.com> | 2015-12-08 01:46:51 -0500 |
| commit | e030f5a0b6445d2f2526abe16e233def99de97bb (patch) | |
| tree | 91e337a81d72a86940bd7e1ac4d32be3f9a148e0 /drivers/net/wireless/bcmdhd/dhd_linux.c | |
| parent | afabf37012e839802f9f3819f621e16aa4acefd2 (diff) | |
| download | kernel_samsung_smdk4412-e030f5a0b6445d2f2526abe16e233def99de97bb.zip kernel_samsung_smdk4412-e030f5a0b6445d2f2526abe16e233def99de97bb.tar.gz kernel_samsung_smdk4412-e030f5a0b6445d2f2526abe16e233def99de97bb.tar.bz2 | |
bcmdhd: update from i9305 source drop (1.141.15 --> 1.141.44)
Change-Id: I0b38869c9f0d5c8695e543b0fc363aff7c9e617a
Diffstat (limited to 'drivers/net/wireless/bcmdhd/dhd_linux.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_linux.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c index ff8e634..4aedc1a 100644 --- a/drivers/net/wireless/bcmdhd/dhd_linux.c +++ b/drivers/net/wireless/bcmdhd/dhd_linux.c @@ -4029,6 +4029,26 @@ dhd_preinit_ioctls(dhd_pub_t *dhd) dhd->suspend_bcn_li_dtim = CUSTOM_SUSPEND_BCN_LI_DTIM; DHD_TRACE(("Enter %s\n", __FUNCTION__)); dhd->op_mode = 0; +#ifdef CUSTOMER_HW4 + if (!dhd_validate_chipid(dhd)) { + DHD_ERROR(("%s: CONFIG_BCMXXX and CHIP ID(%x) is mismatched\n", + __FUNCTION__, dhd_bus_chip_id(dhd))); +#ifndef SUPPORT_MULTIPLE_CHIPS + return BCME_BADARG; +#endif /* !SUPPORT_MULTIPLE_CHIPS */ + } +#endif /* CUSTOMER_HW4 */ + if ((!op_mode && dhd_get_fw_mode(dhd->info) == DHD_FLAG_MFG_MODE) || + (op_mode == DHD_FLAG_MFG_MODE)) { + /* Check and adjust IOCTL response timeout for Manufactring firmware */ + dhd_os_set_ioctl_resp_timeout(MFG_IOCTL_RESP_TIMEOUT); + DHD_ERROR(("%s : Set IOCTL response time for Manufactring Firmware\n", + __FUNCTION__)); + } + else { + dhd_os_set_ioctl_resp_timeout(IOCTL_RESP_TIMEOUT); + DHD_INFO(("%s : Set IOCTL response time.\n", __FUNCTION__)); + } #ifdef GET_CUSTOM_MAC_ENABLE ret = dhd_custom_get_mac_address(ea_addr.octet); if (!ret) { |