4 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index ea896777bcaf..53efd6694e75 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -197,8 +197,8 @@ int tulip_poll(struct net_device *dev, int *budget)
                                                                    tp->rx_buffers[entry].mapping,
                                                                    pkt_len, PCI_DMA_FROMDEVICE);
 #if ! defined(__alpha__)
-                                       eth_copy_and_sum(skb, tp->rx_buffers[entry].skb->data,
-                                                        pkt_len, 0);
+                                       skb_copy_to_linear_data(skb, tp->rx_buffers[entry].skb->data,
+                                                        pkt_len);
                                        skb_put(skb, pkt_len);
 #else
                                        memcpy(skb_put(skb, pkt_len),
@@ -420,8 +420,8 @@ static int tulip_rx(struct net_device *dev)
                                                             tp->rx_buffers[entry].mapping,
                                                             pkt_len, PCI_DMA_FROMDEVICE);
 #if ! defined(__alpha__)
-                                eth_copy_and_sum(skb, tp->rx_buffers[entry].skb->data,
-                                                 pkt_len, 0);
+                                skb_copy_to_linear_data(skb, tp->rx_buffers[entry].skb->data,
+                                                 pkt_len);
                                 skb_put(skb, pkt_len);
 #else
                                 memcpy(skb_put(skb, pkt_len),
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 38f3b99716b8..5824f6a35495 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -1232,7 +1232,7 @@ static int netdev_rx(struct net_device *dev)
                                 pci_dma_sync_single_for_cpu(np->pci_dev,np->rx_addr[entry],
                                                             np->rx_skbuff[entry]->len,
                                                             PCI_DMA_FROMDEVICE);
-                                eth_copy_and_sum(skb, np->rx_skbuff[entry]->data, pkt_len, 0);
+                                skb_copy_to_linear_data(skb, np->rx_skbuff[entry]->data, pkt_len);
                                 skb_put(skb, pkt_len);
                                 pci_dma_sync_single_for_device(np->pci_dev,np->rx_addr[entry],
                                                                np->rx_skbuff[entry]->len,
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 2470b1ee33c0..37e35cd277a1 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -1208,7 +1208,7 @@ static void investigate_read_descriptor(struct net_device *dev,struct xircom_pri
                                 goto out;
                         }
                         skb_reserve(skb, 2);
-                        eth_copy_and_sum(skb, (unsigned char*)&card->rx_buffer[bufferoffset / 4], pkt_len, 0);
+                        skb_copy_to_linear_data(skb, (unsigned char*)&card->rx_buffer[bufferoffset / 4], pkt_len);
                         skb_put(skb, pkt_len);
                         skb->protocol = eth_type_trans(skb, dev);
                         netif_rx(skb);
diff --git a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c
index f64172927377..f984fbde8b23 100644
--- a/drivers/net/tulip/xircom_tulip_cb.c
+++ b/drivers/net/tulip/xircom_tulip_cb.c
@@ -1242,8 +1242,8 @@ xircom_rx(struct net_device *dev)
                                 && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
                                 skb_reserve(skb, 2);    /* 16 byte align the IP header */
 #if ! defined(__alpha__)
-                                eth_copy_and_sum(skb, bus_to_virt(tp->rx_ring[entry].buffer1),
-                                                                 pkt_len, 0);
+                                skb_copy_to_linear_data(skb, bus_to_virt(tp->rx_ring[entry].buffer1),
+                                                                 pkt_len);
                                 skb_put(skb, pkt_len);
 #else
                                 memcpy(skb_put(skb, pkt_len),