From e45766c2cf263e3c6a345654faf595ce34c21b1d Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Sat, 4 Sep 2010 10:34:29 +0000
Subject: [PATCH] --- yaml --- r: 210583 b: refs/heads/master c:
 64289c8e6851bca0e589e064c9a5c9fbd6ae5dd4 h: refs/heads/master i:   210581:
 ce3b187a462162e4d6de67b372916b58889bd4aa   210579:
 e4c6bd009c4d90f7f6c39eab9c12baab4316c5b5   210575:
 579cad92ccb94cd113013b2f35d99b4c334ae2e2 v: v3

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

diff --git a/[refs] b/[refs]
index 1198d2031046..66c4ddfe7b31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de2b96f1212722eb0af80bf9a029d03d8fc673a9
+refs/heads/master: 64289c8e6851bca0e589e064c9a5c9fbd6ae5dd4
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index 26396ff67cf9..c83b421341c0 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -2706,7 +2706,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
 	} else if (skb_gro_len(p) != pinfo->gso_size)
 		return -E2BIG;
 
-	headroom = NET_SKB_PAD + NET_IP_ALIGN;
+	headroom = skb_headroom(p);
 	nskb = alloc_skb(headroom + skb_gro_offset(p), GFP_ATOMIC);
 	if (unlikely(!nskb))
 		return -ENOMEM;