---

yaml --- r: 276246 b: refs/heads/master c: 5e2afba h: refs/heads/master v: v3
git-mirror · Nov 21, 2011 · 5d82bde · 5d82bde
1 parent 21b76af
commit 5d82bde
Show file tree

Hide file tree

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