summaryrefslogtreecommitdiffstats
path: root/drivers/net/atlx
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-06-04 20:50:00 +0200
committerDavid S. Miller <davem@davemloft.net>2008-06-04 20:50:00 +0200
commit8b91ac09732895f928ed6107bda5318cf260520b (patch)
tree5fc787bb3e0f4a4f84a928b7708023e4996608cd /drivers/net/atlx
parenttcp: Fix inconsistency source (CA_Open only when !tcp_left_out(tp)) (diff)
parent[netdrvr] tulip: oops in tulip_interrupt when hibernating with swsusp/suspend2 (diff)
downloadlinux-8b91ac09732895f928ed6107bda5318cf260520b.tar.xz
linux-8b91ac09732895f928ed6107bda5318cf260520b.zip
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/atlx')
-rw-r--r--drivers/net/atlx/atl1.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 6e4c80d41b08..6ddc911e7d15 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -2023,6 +2023,7 @@ rrd_ok:
/* Good Receive */
pci_unmap_page(adapter->pdev, buffer_info->dma,
buffer_info->length, PCI_DMA_FROMDEVICE);
+ buffer_info->dma = 0;
skb = buffer_info->skb;
length = le16_to_cpu(rrd->xsz.xsum_sz.pkt_size);