From: David S. Miller <davem@davemloft.net>
Date: Mon, 11 Jun 2007 00:55:04 +0000 (-0700)
Subject: r8169: kill eth_copy_and_sum()
X-Git-Tag: v2.6.23-rc1~1201^2~23
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=278667ba186a23770b0dd23ccd26de56a8cc4ec2;p=linux-2.6-omap-h63xx.git

r8169: 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>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
---

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 1f7fb541ec5..e4827a41468 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2495,7 +2495,7 @@ static inline int rtl8169_try_rx_copy(struct sk_buff **sk_buff, int pkt_size,
 		skb = dev_alloc_skb(pkt_size + align);
 		if (skb) {
 			skb_reserve(skb, (align - 1) & (unsigned long)skb->data);
-			eth_copy_and_sum(skb, sk_buff[0]->data, pkt_size, 0);
+			skb_copy_from_linear_data(*sk_buff, skb->data, pkt_size);
 			*sk_buff = skb;
 			rtl8169_mark_to_asic(desc, rx_buf_sz);
 			ret = 0;