diff options
| author | Michael Chan <mchan@broadcom.com> | 2012-07-10 10:04:40 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-10 23:33:47 -0700 |
| commit | c1f5163de417dab01fa9daaf09a74bbb19303f3c (patch) | |
| tree | 7606bdf368609cd6a2f8576f13346413b6365dc0 | |
| parent | b28ba72665356438e3a6e3be365c3c3071496840 (diff) | |
| download | linux-c1f5163de417dab01fa9daaf09a74bbb19303f3c.tar.gz linux-c1f5163de417dab01fa9daaf09a74bbb19303f3c.tar.bz2 linux-c1f5163de417dab01fa9daaf09a74bbb19303f3c.zip | |
bnx2: Fix bug in bnx2_free_tx_skbs().
In rare cases, bnx2x_free_tx_skbs() can unmap the wrong DMA address
when it gets to the last entry of the tx ring. We were not using
the proper macro to skip the last entry when advancing the tx index.
Reported-by: Zongyun Lai <zlai@vmware.com>
Reviewed-by: Jeffrey Huang <huangjw@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index ac7b74488531..1fa4927a45b1 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -5372,7 +5372,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp) int k, last; if (skb == NULL) { - j++; + j = NEXT_TX_BD(j); continue; } @@ -5384,8 +5384,8 @@ bnx2_free_tx_skbs(struct bnx2 *bp) tx_buf->skb = NULL; last = tx_buf->nr_frags; - j++; - for (k = 0; k < last; k++, j++) { + j = NEXT_TX_BD(j); + for (k = 0; k < last; k++, j = NEXT_TX_BD(j)) { tx_buf = &txr->tx_buf_ring[TX_RING_IDX(j)]; dma_unmap_page(&bp->pdev->dev, dma_unmap_addr(tx_buf, mapping), |