From 55373ff118e4b2578a0f3dc8ea50e0eefbfa3be5 Mon Sep 17 00:00:00 2001
From: Mikael Pettersson <mikpe@it.uu.se>
Date: Sat, 19 May 2007 13:55:25 -0700
Subject: [PATCH] --- yaml --- r: 56703 b: refs/heads/master c:
 b6ccc67d8e42e38936df330b26ee6d022dda8a64 h: refs/heads/master i:   56701:
 71f91e78fc2b77ee4ea6efe7c35efa672957945e   56699:
 0b4e5dd3bb15046346bcc08e70086036b76a15e2   56695:
 3c92b5c9c989db1910b38513fa7d8977b4114f57   56687:
 c11232348671afedff82e1b07642adf5b214169a   56671:
 12a38569f09d266845328c4fbd395c10ae4a372d   56639:
 c36ded5cca4d770c2eedebdde260a9c7296fbbd0   56575:
 195f9a7005f9395322cb18321c7e7cba40139742 v: v3

---
 [refs]                  | 2 +-
 trunk/net/core/skbuff.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5d359c59a6f5..22229be61e3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d007da1fa6f0ad5e01ceae4a1f60cdbb23ecd706
+refs/heads/master: b6ccc67d8e42e38936df330b26ee6d022dda8a64
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index 142257307fa2..7c6a34e21eee 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -644,11 +644,10 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
 
 	/* Copy only real data... and, alas, header. This should be
 	 * optimized for the cases when header is void. */
-	memcpy(data + nhead, skb->head,
 #ifdef NET_SKBUFF_DATA_USES_OFFSET
-		skb->tail);
+	memcpy(data + nhead, skb->head, skb->tail);
 #else
-		skb->tail - skb->head);
+	memcpy(data + nhead, skb->head, skb->tail - skb->head);
 #endif
 	memcpy(data + size, skb_end_pointer(skb),
 	       sizeof(struct skb_shared_info));