diff options
author | David S. Miller <davem@davemloft.net> | 2007-07-11 01:08:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-07-11 01:08:12 -0400 |
commit | 8c7b7faaa630fef7f68d8728cee1cce398cc9697 (patch) | |
tree | 844c5c5aad361b7c1e24f8d0b8f3195c4a4ad816 /drivers/net/tulip | |
parent | a7ab4b501f9b8a9dc4d5cee542db67b6ccd1088b (diff) |
[NET]: Kill eth_copy_and_sum().
It hasn't "summed" anything in over 7 years, and it's
just a straight mempcy ala skb_copy_to_linear_data()
so just get rid of it.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r-- | drivers/net/tulip/interrupt.c | 8 | ||||
-rw-r--r-- | drivers/net/tulip/winbond-840.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/xircom_cb.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/xircom_tulip_cb.c | 4 |
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) | |||
197 | tp->rx_buffers[entry].mapping, | 197 | tp->rx_buffers[entry].mapping, |
198 | pkt_len, PCI_DMA_FROMDEVICE); | 198 | pkt_len, PCI_DMA_FROMDEVICE); |
199 | #if ! defined(__alpha__) | 199 | #if ! defined(__alpha__) |
200 | eth_copy_and_sum(skb, tp->rx_buffers[entry].skb->data, | 200 | skb_copy_to_linear_data(skb, tp->rx_buffers[entry].skb->data, |
201 | pkt_len, 0); | 201 | pkt_len); |
202 | skb_put(skb, pkt_len); | 202 | skb_put(skb, pkt_len); |
203 | #else | 203 | #else |
204 | memcpy(skb_put(skb, pkt_len), | 204 | memcpy(skb_put(skb, pkt_len), |
@@ -420,8 +420,8 @@ static int tulip_rx(struct net_device *dev) | |||
420 | tp->rx_buffers[entry].mapping, | 420 | tp->rx_buffers[entry].mapping, |
421 | pkt_len, PCI_DMA_FROMDEVICE); | 421 | pkt_len, PCI_DMA_FROMDEVICE); |
422 | #if ! defined(__alpha__) | 422 | #if ! defined(__alpha__) |
423 | eth_copy_and_sum(skb, tp->rx_buffers[entry].skb->data, | 423 | skb_copy_to_linear_data(skb, tp->rx_buffers[entry].skb->data, |
424 | pkt_len, 0); | 424 | pkt_len); |
425 | skb_put(skb, pkt_len); | 425 | skb_put(skb, pkt_len); |
426 | #else | 426 | #else |
427 | memcpy(skb_put(skb, pkt_len), | 427 | 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) | |||
1232 | pci_dma_sync_single_for_cpu(np->pci_dev,np->rx_addr[entry], | 1232 | pci_dma_sync_single_for_cpu(np->pci_dev,np->rx_addr[entry], |
1233 | np->rx_skbuff[entry]->len, | 1233 | np->rx_skbuff[entry]->len, |
1234 | PCI_DMA_FROMDEVICE); | 1234 | PCI_DMA_FROMDEVICE); |
1235 | eth_copy_and_sum(skb, np->rx_skbuff[entry]->data, pkt_len, 0); | 1235 | skb_copy_to_linear_data(skb, np->rx_skbuff[entry]->data, pkt_len); |
1236 | skb_put(skb, pkt_len); | 1236 | skb_put(skb, pkt_len); |
1237 | pci_dma_sync_single_for_device(np->pci_dev,np->rx_addr[entry], | 1237 | pci_dma_sync_single_for_device(np->pci_dev,np->rx_addr[entry], |
1238 | np->rx_skbuff[entry]->len, | 1238 | 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 | |||
1208 | goto out; | 1208 | goto out; |
1209 | } | 1209 | } |
1210 | skb_reserve(skb, 2); | 1210 | skb_reserve(skb, 2); |
1211 | eth_copy_and_sum(skb, (unsigned char*)&card->rx_buffer[bufferoffset / 4], pkt_len, 0); | 1211 | skb_copy_to_linear_data(skb, (unsigned char*)&card->rx_buffer[bufferoffset / 4], pkt_len); |
1212 | skb_put(skb, pkt_len); | 1212 | skb_put(skb, pkt_len); |
1213 | skb->protocol = eth_type_trans(skb, dev); | 1213 | skb->protocol = eth_type_trans(skb, dev); |
1214 | netif_rx(skb); | 1214 | 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) | |||
1242 | && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { | 1242 | && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { |
1243 | skb_reserve(skb, 2); /* 16 byte align the IP header */ | 1243 | skb_reserve(skb, 2); /* 16 byte align the IP header */ |
1244 | #if ! defined(__alpha__) | 1244 | #if ! defined(__alpha__) |
1245 | eth_copy_and_sum(skb, bus_to_virt(tp->rx_ring[entry].buffer1), | 1245 | skb_copy_to_linear_data(skb, bus_to_virt(tp->rx_ring[entry].buffer1), |
1246 | pkt_len, 0); | 1246 | pkt_len); |
1247 | skb_put(skb, pkt_len); | 1247 | skb_put(skb, pkt_len); |
1248 | #else | 1248 | #else |
1249 | memcpy(skb_put(skb, pkt_len), | 1249 | memcpy(skb_put(skb, pkt_len), |