diff options
| author | Brian King <brking@linux.vnet.ibm.com> | 2011-09-07 14:41:03 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-16 15:26:32 -0400 |
| commit | 33a48ab105a75d37021e422a0a3283241099b142 (patch) | |
| tree | e52a8350d91f44cdc4c17d012354bfcf15771a42 | |
| parent | 52b9aca7ae8726d1fb41b97dd1d243d107fef11b (diff) | |
| download | op-kernel-dev-33a48ab105a75d37021e422a0a3283241099b142.zip op-kernel-dev-33a48ab105a75d37021e422a0a3283241099b142.tar.gz | |
ibmveth: Fix DMA unmap error
Commit 6e8ab30ec677 (ibmveth: Add scatter-gather support) introduced a
DMA mapping API inconsistency resulting in dma_unmap_page getting
called on memory mapped via dma_map_single. This was seen when
CONFIG_DMA_API_DEBUG was enabled. Fix up this API usage inconsistency.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Acked-by: Anton Blanchard <anton@samba.org>
Cc: <stable@kernel.org> # v2.6.37+
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ibmveth.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 3e66792..dcf65d8 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c @@ -1026,7 +1026,12 @@ retry_bounce: netdev->stats.tx_bytes += skb->len; } - for (i = 0; i < skb_shinfo(skb)->nr_frags + 1; i++) + dma_unmap_single(&adapter->vdev->dev, + descs[0].fields.address, + descs[0].fields.flags_len & IBMVETH_BUF_LEN_MASK, + DMA_TO_DEVICE); + + for (i = 1; i < skb_shinfo(skb)->nr_frags + 1; i++) dma_unmap_page(&adapter->vdev->dev, descs[i].fields.address, descs[i].fields.flags_len & IBMVETH_BUF_LEN_MASK, DMA_TO_DEVICE); |
