---

yaml --- r: 56703 b: refs/heads/master c: b6ccc67 h: refs/heads/master i: 56701: 71f91e7 56699: 0b4e5dd 56695: 3c92b5c 56687: c112323 56671: 12a3856 56639: c36ded5 56575: 195f9a7 v: v3
git-mirror · May 19, 2007 · 55373ff · 55373ff
1 parent bd4d93e
commit 55373ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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));