diff options
author | rogersb11 <brettrogers11@gmail.com> | 2015-12-08 17:47:58 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-12-08 15:27:13 -0800 |
commit | 546eacec92bfd72fb3bc4fe30a7db84d54c24b26 (patch) | |
tree | 3f3bf0659408ac5ca4280a632146b29d1564b764 /drivers/net/wireless/bcmdhd/dhd_linux.c | |
parent | 31a71061e8e46a3cace26ee2dfd06c5405aa514f (diff) | |
download | kernel_samsung_smdk4412-546eacec92bfd72fb3bc4fe30a7db84d54c24b26.zip kernel_samsung_smdk4412-546eacec92bfd72fb3bc4fe30a7db84d54c24b26.tar.gz kernel_samsung_smdk4412-546eacec92bfd72fb3bc4fe30a7db84d54c24b26.tar.bz2 |
Revert "bcmdhd: update from i9305 source drop (1.141.15 --> 1.141.44)"
This reverts commit e030f5a0b6445d2f2526abe16e233def99de97bb.
Change-Id: I9ba7cb2baefd8435d5e74aeaca188fc1cdfdab2c
Diffstat (limited to 'drivers/net/wireless/bcmdhd/dhd_linux.c')
-rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_linux.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c index 4aedc1a..ff8e634 100644 --- a/drivers/net/wireless/bcmdhd/dhd_linux.c +++ b/drivers/net/wireless/bcmdhd/dhd_linux.c @@ -4029,26 +4029,6 @@ 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) { |