git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
[pandora-kernel.git]
/
drivers
/
net
/
typhoon.c
diff --git
a/drivers/net/typhoon.c
b/drivers/net/typhoon.c
index
0f2c061
..
0358720
100644
(file)
--- a/
drivers/net/typhoon.c
+++ b/
drivers/net/typhoon.c
@@
-1703,7
+1703,7
@@
typhoon_rx(struct typhoon *tp, struct basic_ring *rxRing, volatile u32 * ready,
pci_dma_sync_single_for_cpu(tp->pdev, dma_addr,
PKT_BUF_SZ,
PCI_DMA_FROMDEVICE);
pci_dma_sync_single_for_cpu(tp->pdev, dma_addr,
PKT_BUF_SZ,
PCI_DMA_FROMDEVICE);
-
eth_copy_and_sum(new_skb, skb->data, pkt_len, 0
);
+
skb_copy_to_linear_data(new_skb, skb->data, pkt_len
);
pci_dma_sync_single_for_device(tp->pdev, dma_addr,
PKT_BUF_SZ,
PCI_DMA_FROMDEVICE);
pci_dma_sync_single_for_device(tp->pdev, dma_addr,
PKT_BUF_SZ,
PCI_DMA_FROMDEVICE);