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;