diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2013-06-13 15:31:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-13 17:09:40 -0700 |
| commit | c9bfbb31af7c8428267b34eb9706a621ac219a28 (patch) | |
| tree | 684e440cc058731ebd4bb0186f19621459f2fdde /drivers/net/ethernet/dec | |
| parent | dd019897358b815f7828dab90b51d51df4d3658d (diff) | |
| download | talos-obmc-linux-c9bfbb31af7c8428267b34eb9706a621ac219a28.tar.gz talos-obmc-linux-c9bfbb31af7c8428267b34eb9706a621ac219a28.zip | |
tulip: Properly check dma mapping result
Tulip throws an error when dma debugging is enabled, as it doesn't properly
check dma mapping results with dma_mapping_error() durring tx ring refills.
Easy fix, just add it in, and drop the frame if the mapping is bad
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
CC: Grant Grundler <grundler@parisc-linux.org>
CC: "David S. Miller" <davem@davemloft.net>
Reviewed-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/dec')
| -rw-r--r-- | drivers/net/ethernet/dec/tulip/interrupt.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/dec/tulip/interrupt.c b/drivers/net/ethernet/dec/tulip/interrupt.c index 28a5e425fecf..92306b320840 100644 --- a/drivers/net/ethernet/dec/tulip/interrupt.c +++ b/drivers/net/ethernet/dec/tulip/interrupt.c @@ -76,6 +76,12 @@ int tulip_refill_rx(struct net_device *dev) mapping = pci_map_single(tp->pdev, skb->data, PKT_BUF_SZ, PCI_DMA_FROMDEVICE); + if (dma_mapping_error(&tp->pdev->dev, mapping)) { + dev_kfree_skb(skb); + tp->rx_buffers[entry].skb = NULL; + break; + } + tp->rx_buffers[entry].mapping = mapping; tp->rx_ring[entry].buffer1 = cpu_to_le32(mapping); |
