diff options
| author | Lin Ma <linm@broadcom.com> | 2011-06-27 18:53:59 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2011-07-01 17:03:37 -0700 |
| commit | 3f409b9c1f6300114f8de2f52f518decafdeb451 (patch) | |
| tree | 78c238ac7200247e4b47e689ccd6e61725c130ed /drivers/net/wireless/bcmdhd/linux_osl.c | |
| parent | 0db1fec422e22f9c7726f3c3a091bc834121728a (diff) | |
Update to 5.90.125.32:
* Move Android specific functions to wl_android (wifi control functions,
wifi device, pre-alloc buffer.)
* Link Android start/stop commands to interface up/down (download firmware
when primary interfacde is up.)
* Fix a issue in driver unload, the same IRQ can not be disabled twice
(set_irq_wake)
Change-Id: Id49c4f746f69371323c9a34834c3b628b78ff713
Signed-off-by: Howard M. Harte <hharte@broadcom.com>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/linux_osl.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/linux_osl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/bcmdhd/linux_osl.c b/drivers/net/wireless/bcmdhd/linux_osl.c index eda5ddffd32..4c4a76d60cf 100644 --- a/drivers/net/wireless/bcmdhd/linux_osl.c +++ b/drivers/net/wireless/bcmdhd/linux_osl.c @@ -161,7 +161,8 @@ osl_error(int bcmerror) return linuxbcmerrormap[-bcmerror]; } -void * dhd_os_prealloc(int section, unsigned long size); +extern uint8* dhd_os_prealloc(void *osh, int section, int size); + osl_t * osl_attach(void *pdev, uint bustype, bool pkttag) { @@ -201,9 +202,9 @@ osl_attach(void *pdev, uint bustype, bool pkttag) break; } -#ifdef DHD_USE_STATIC_BUF +#if defined(DHD_USE_STATIC_BUF) if (!bcm_static_buf) { - if (!(bcm_static_buf = (bcm_static_buf_t *)dhd_os_prealloc(3, STATIC_BUF_SIZE+ + if (!(bcm_static_buf = (bcm_static_buf_t *)dhd_os_prealloc(osh, 3, STATIC_BUF_SIZE+ STATIC_BUF_TOTAL_LEN))) { printk("can not alloc static buf!\n"); } @@ -223,7 +224,7 @@ osl_attach(void *pdev, uint bustype, bool pkttag) int i; void *skb_buff_ptr = 0; bcm_static_skb = (bcm_static_pkt_t *)((char *)bcm_static_buf + 2048); - skb_buff_ptr = dhd_os_prealloc(4, 0); + skb_buff_ptr = dhd_os_prealloc(osh, 4, 0); bcopy(skb_buff_ptr, bcm_static_skb, sizeof(struct sk_buff *)*16); for (i = 0; i < MAX_STATIC_PKT_NUM*2; i++) |