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_common.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_common.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_common.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_common.c b/drivers/net/wireless/bcmdhd/dhd_common.c index 6376546c62c0..a54c39152e47 100644 --- a/drivers/net/wireless/bcmdhd/dhd_common.c +++ b/drivers/net/wireless/bcmdhd/dhd_common.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_common.c 297563 2011-11-20 15:38:29Z $ + * $Id: dhd_common.c 307573 2012-01-12 00:04:39Z $ */ #include <typedefs.h> #include <osl.h> @@ -336,6 +336,11 @@ dhd_doiovar(dhd_pub_t *dhd_pub, const bcm_iovar_t *vi, uint32 actionid, const ch case IOV_SVAL(IOV_MSGLEVEL): dhd_msg_level = int_val; +#ifdef WL_CFG80211 + /* Enable DHD and WL logs in oneshot */ + if (dhd_msg_level & DHD_WL_VAL) + wl_cfg80211_enable_trace(dhd_msg_level); +#endif break; case IOV_GVAL(IOV_BCMERRORSTR): bcm_strncpy_s((char *)arg, len, bcmerrorstr(dhd_pub->bcmerror), BCME_STRLEN); |