From 5d82bde06c11774e0c49b66c25c8d1171f9c42d3 Mon Sep 17 00:00:00 2001
From: Paul Guo <ggang@tilera.com>
Date: Mon, 14 Nov 2011 19:00:54 +0800
Subject: [PATCH] --- yaml --- r: 276246 b: refs/heads/master c:
 5e2afba4ecd7931ea06e6fa116ab28e6943dbd42 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/netfilter.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1584c8a39034..6ee80e6d86f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 648ae8e53d58ed1b667db173a2d4ff2132a3b529
+refs/heads/master: 5e2afba4ecd7931ea06e6fa116ab28e6943dbd42
diff --git a/trunk/net/ipv4/netfilter.c b/trunk/net/ipv4/netfilter.c
index 9899619ab9b8..4f47e064e262 100644
--- a/trunk/net/ipv4/netfilter.c
+++ b/trunk/net/ipv4/netfilter.c
@@ -64,7 +64,8 @@ int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type)
 	/* Change in oif may mean change in hh_len. */
 	hh_len = skb_dst(skb)->dev->hard_header_len;
 	if (skb_headroom(skb) < hh_len &&
-	    pskb_expand_head(skb, hh_len - skb_headroom(skb), 0, GFP_ATOMIC))
+	    pskb_expand_head(skb, HH_DATA_ALIGN(hh_len - skb_headroom(skb)),
+				0, GFP_ATOMIC))
 		return -1;
 
 	return 0;