diff options
| author | Greg Goldman <ggoldman@broadcom.com> | 2011-06-29 14:34:18 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2011-07-01 17:04:11 -0700 |
| commit | ff8f36c95c1aa102075ce5f66d5ddd4a1c490442 (patch) | |
| tree | afba76c291520130c96dcc243f26ed2d0f590c8b /drivers/net/wireless/bcmdhd/linux_osl.c | |
| parent | 9bcfe37603163f994804eafa21f3b0cf64a41037 (diff) | |
Update to 5.90.125.33
Add logic to get MAC address before firmware is loaded
Change-Id: I2151a0fcc5aab914cfec8bfedf761b9f06445d1a
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 | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcmdhd/linux_osl.c b/drivers/net/wireless/bcmdhd/linux_osl.c index 4c4a76d60cfe..bbb240840c42 100644 --- a/drivers/net/wireless/bcmdhd/linux_osl.c +++ b/drivers/net/wireless/bcmdhd/linux_osl.c @@ -603,7 +603,7 @@ osl_pktfree_static(osl_t *osh, void *p, bool send) { int i; - for (i = 0; i < MAX_STATIC_PKT_NUM*2; i++) + for (i = 0; i < MAX_STATIC_PKT_NUM; i++) { if (p == bcm_static_skb->skb_4k[i]) { @@ -611,10 +611,22 @@ osl_pktfree_static(osl_t *osh, void *p, bool send) bcm_static_skb->pkt_use[i] = 0; up(&bcm_static_skb->osl_pkt_sem); + return; + } + } + + for (i = 0; i < MAX_STATIC_PKT_NUM; i++) + { + if (p == bcm_static_skb->skb_8k[i]) + { + down(&bcm_static_skb->osl_pkt_sem); + bcm_static_skb->pkt_use[i + MAX_STATIC_PKT_NUM] = 0; + up(&bcm_static_skb->osl_pkt_sem); return; } } + return osl_pktfree(osh, p, send); } #endif |