From 9befa85a7a490dc5518311911cdb403da3617767 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sun, 10 Jun 2007 17:55:04 -0700
Subject: [PATCH] --- yaml --- r: 58388 b: refs/heads/master c:
 278667ba186a23770b0dd23ccd26de56a8cc4ec2 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/r8169.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index be110365f546..104306b0ec27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ae47c2ddc55e3c571bb55fca921cfe9b02a685f
+refs/heads/master: 278667ba186a23770b0dd23ccd26de56a8cc4ec2
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index 1f7fb541ec54..e4827a414689 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/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;