summaryrefslogtreecommitdiff
path: root/net/ipv4
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-11-29 01:20:55 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-29 01:20:55 -0500
commitc1baa88431fe0fe4fad492dece4177a7735f89cf (patch)
tree3513c0018bd149625aa999b82c0ed6097a55a267 /net/ipv4
parenta5e5c37434eb182cf50cec90d9736d9a9a390116 (diff)
parent70e9942f17a6193e9172a804e6569a8806633d6b (diff)
Merge branch 'nf' of git://1984.lsi.us.es/net
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/netfilter.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index 9899619ab9b8..4f47e064e262 100644
--- a/net/ipv4/netfilter.c
+++ b/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;