diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-01-24 13:47:47 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-01-27 15:32:33 -0800 |
| commit | 494661a1acbd4767e4d7daaff8d7ce55328913d9 (patch) | |
| tree | 69659915c7dc9110804cc94935b1290f626e78b7 /drivers/net/wireless/bcmdhd/dhd_cdc.c | |
| parent | 1dddb0cc0de2840a2fe43a02fcb0196bb5cb86c8 (diff) | |
net: wireless: bcmdhd: Update to Version 5.90.195.19
- Add WFD changes
- Add extra locking for internal ioctl operations
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/dhd_cdc.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_cdc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_cdc.c b/drivers/net/wireless/bcmdhd/dhd_cdc.c index 50e275a4ae23..d01853c71a2e 100644 --- a/drivers/net/wireless/bcmdhd/dhd_cdc.c +++ b/drivers/net/wireless/bcmdhd/dhd_cdc.c @@ -21,7 +21,7 @@ * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. * - * $Id: dhd_cdc.c 301794 2011-12-08 20:41:35Z $ + * $Id: dhd_cdc.c 303389 2011-12-16 09:30:48Z $ * * BDC is like CDC, except it includes a header for data packets to convey * packet priority over the bus, and flags (e.g. to indicate checksum status @@ -2515,9 +2515,10 @@ dhd_prot_init(dhd_pub_t *dhd) ret = dhd_wlfc_init(dhd); #endif -#if !defined(WL_CFG80211) +#if defined(WL_CFG80211) + if (dhd_download_fw_on_driverload) +#endif /* defined(WL_CFG80211) */ ret = dhd_preinit_ioctls(dhd); -#endif /* WL_CFG80211 */ /* Always assumes wl for now */ dhd->iswl = TRUE; |