From 4e27cf10db3f88d9980f50e2bc99e9bcc300f984 Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Fri, 8 Aug 2008 18:35:56 -0700
Subject: [PATCH] --- yaml --- r: 108766 b: refs/heads/master c:
 808ff676c46d8e259c2cb38579f94f8e6ae38009 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/e1000e/netdev.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3688bdb499bf..0546a2917a38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d06cad1a5ceb3b04dc9547e261ad4fcebf7433d
+refs/heads/master: 808ff676c46d8e259c2cb38579f94f8e6ae38009
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
index 05b0b2f9c54b..efa944509a39 100644
--- a/trunk/drivers/net/e1000e/netdev.c
+++ b/trunk/drivers/net/e1000e/netdev.c
@@ -510,9 +510,12 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
 			    netdev_alloc_skb(netdev, length + NET_IP_ALIGN);
 			if (new_skb) {
 				skb_reserve(new_skb, NET_IP_ALIGN);
-				memcpy(new_skb->data - NET_IP_ALIGN,
-				       skb->data - NET_IP_ALIGN,
-				       length + NET_IP_ALIGN);
+				skb_copy_to_linear_data_offset(new_skb,
+							       -NET_IP_ALIGN,
+							       (skb->data -
+								NET_IP_ALIGN),
+							       (length +
+								NET_IP_ALIGN));
 				/* save the skb in buffer_info as good */
 				buffer_info->skb = skb;
 				skb = new_skb;