diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-04-12 10:18:39 -0700 |
|---|---|---|
| committer | Andreas Blaesius <skate4life@gmx.de> | 2016-04-30 11:03:00 +0200 |
| commit | d39f14bcc7f855ab900123813abb41821dc59fb4 (patch) | |
| tree | 833de684382719c4e52a03d3ce9313b83af96506 /drivers/net/wireless/bcmdhd/siutils.c | |
| parent | 33eab8dfb9790a6f54218b525b20a8844e6c0a56 (diff) | |
| download | kernel_samsung_espresso10-d39f14bcc7f855ab900123813abb41821dc59fb4.zip kernel_samsung_espresso10-d39f14bcc7f855ab900123813abb41821dc59fb4.tar.gz kernel_samsung_espresso10-d39f14bcc7f855ab900123813abb41821dc59fb4.tar.bz2 | |
net: wireless: bcmdhd: Update to Version 6.10.83.0 (1.23)
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/siutils.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/siutils.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcmdhd/siutils.c b/drivers/net/wireless/bcmdhd/siutils.c index 5cfb54e..2d2b7db 100644 --- a/drivers/net/wireless/bcmdhd/siutils.c +++ b/drivers/net/wireless/bcmdhd/siutils.c @@ -22,7 +22,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: siutils.c 309908 2012-01-21 00:14:29Z $ + * $Id: siutils.c 323774 2012-03-27 00:16:45Z $ */ #include <bcm_cfg.h> @@ -1131,6 +1131,11 @@ si_watchdog_ms(si_t *sih, uint32 ms) si_watchdog(sih, wd_msticks * ms); } +uint32 si_watchdog_msticks(void) +{ + return wd_msticks; +} + bool si_taclear(si_t *sih, bool details) { @@ -1935,6 +1940,10 @@ si_socram_srmem_size(si_t *sih) uint32 coreinfo; uint memsize = 0; + if ((CHIPID(sih->chip) == BCM4334_CHIP_ID) && (CHIPREV(sih->chiprev) < 2)) { + return (32 * 1024); + } + sii = SI_INFO(sih); /* Block ints and save current core */ |