kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes

Browse source
This commit is contained in:
Jeff Garzik 2006-06-08 15:46:27 -04:00
commit 2e84abe742
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/net/wireless/bcm43xx/bcm43xx_dma.c
View file

@ -624,25 +624,28 @@ err_destroy_tx0:
static u16 generate_cookie(struct bcm43xx_dmaring *ring, static u16 generate_cookie(struct bcm43xx_dmaring *ring,
int slot) int slot)
{ {
u16 cookie = 0x0000; u16 cookie = 0xF000;
/* Use the upper 4 bits of the cookie as /* Use the upper 4 bits of the cookie as
* DMA controller ID and store the slot number * DMA controller ID and store the slot number
* in the lower 12 bits * in the lower 12 bits.
* Note that the cookie must never be 0, as this
* is a special value used in RX path.
*/ */
switch (ring->mmio_base) { switch (ring->mmio_base) {
default: default:
assert(0); assert(0);
case BCM43xx_MMIO_DMA1_BASE: case BCM43xx_MMIO_DMA1_BASE:
cookie = 0xA000;
break; break;
case BCM43xx_MMIO_DMA2_BASE: case BCM43xx_MMIO_DMA2_BASE:
cookie = 0x1000; cookie = 0xB000;
break; break;
case BCM43xx_MMIO_DMA3_BASE: case BCM43xx_MMIO_DMA3_BASE:
cookie = 0x2000; cookie = 0xC000;
break; break;
case BCM43xx_MMIO_DMA4_BASE: case BCM43xx_MMIO_DMA4_BASE:
cookie = 0x3000; cookie = 0xD000;
break; break;
} }
assert(((u16)slot & 0xF000) == 0x0000); assert(((u16)slot & 0xF000) == 0x0000);
@ -660,16 +663,16 @@ struct bcm43xx_dmaring * parse_cookie(struct bcm43xx_private *bcm,
struct bcm43xx_dmaring *ring = NULL; struct bcm43xx_dmaring *ring = NULL;
switch (cookie & 0xF000) { switch (cookie & 0xF000) {
case 0x0000: case 0xA000:
ring = dma->tx_ring0; ring = dma->tx_ring0;
break; break;
case 0x1000: case 0xB000:
ring = dma->tx_ring1; ring = dma->tx_ring1;
break; break;
case 0x2000: case 0xC000:
ring = dma->tx_ring2; ring = dma->tx_ring2;
break; break;
case 0x3000: case 0xD000:
ring = dma->tx_ring3; ring = dma->tx_ring3;
break; break;
default: default:
@ -839,8 +842,18 @@ static void dma_rx(struct bcm43xx_dmaring *ring,
/* We received an xmit status. */ /* We received an xmit status. */
struct bcm43xx_hwxmitstatus *hw = (struct bcm43xx_hwxmitstatus *)skb->data; struct bcm43xx_hwxmitstatus *hw = (struct bcm43xx_hwxmitstatus *)skb->data;
struct bcm43xx_xmitstatus stat; struct bcm43xx_xmitstatus stat;
int i = 0;
stat.cookie = le16_to_cpu(hw->cookie); stat.cookie = le16_to_cpu(hw->cookie);
while (stat.cookie == 0) {
if (unlikely(++i >= 10000)) {
assert(0);
break;
}
udelay(2);
barrier();
stat.cookie = le16_to_cpu(hw->cookie);
}
stat.flags = hw->flags; stat.flags = hw->flags;
stat.cnt1 = hw->cnt1; stat.cnt1 = hw->cnt1;
stat.cnt2 = hw->cnt2; stat.cnt2 = hw->cnt2;