diff options
| author | FUJITA Tomonori | 2010-04-04 23:40:18 +0200 |
|---|---|---|
| committer | David S. Miller | 2010-04-08 05:59:26 +0200 |
| commit | b681ee77f8ad248b0fdcec2e5e8c4df6e757eba3 (patch) | |
| tree | 6857b8e1dac8847855eb4baaf3632f55035369a7 /drivers/net/benet/be_main.c | |
| parent | benet: use the dma state API instead of the pci equivalents (diff) | |
| download | kernel-qcow2-linux-b681ee77f8ad248b0fdcec2e5e8c4df6e757eba3.tar.gz kernel-qcow2-linux-b681ee77f8ad248b0fdcec2e5e8c4df6e757eba3.tar.xz kernel-qcow2-linux-b681ee77f8ad248b0fdcec2e5e8c4df6e757eba3.zip | |
benet: fix the misusage of zero dma address
benet driver wrongly assumes that zero is an invalid dma address
(calls dma_unmap_page for only non zero dma addresses). Zero is a
valid dma address on some architectures. The dma length can be used
here.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Sathya Perla <sathyap@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet/be_main.c')
| -rw-r--r-- | drivers/net/benet/be_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 833618339d4d..18e0a80d3e61 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -404,7 +404,7 @@ static void unmap_tx_frag(struct pci_dev *pdev, struct be_eth_wrb *wrb, be_dws_le_to_cpu(wrb, sizeof(*wrb)); dma = (u64)wrb->frag_pa_hi << 32 | (u64)wrb->frag_pa_lo; - if (dma != 0) { + if (wrb->frag_len) { if (unmap_single) pci_unmap_single(pdev, dma, wrb->frag_len, PCI_DMA_TODEVICE); |