Le mercredi 16 novembre 2011 à 17:54 +0100, Pablo Neira Ayuso a écrit : > Hi Eric, > > On Mon, Nov 14, 2011 at 10:46:40AM +0100, Eric Dumazet wrote: > > Le lundi 14 novembre 2011 à 16:33 +0800, Paul Guo a écrit : > > > > git://1984.lsi.us.es/net/.git > > > > > > OK. Here is the patch based on above git tree. > > > > > > > > > Signed-off-by: Paul Guo <ggang@xxxxxxxxxx> > > > --- > > > net/ipv4/netfilter.c | 3 ++- > > > 1 files changed, 2 insertions(+), 1 deletions(-) > > > > > > diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c > > > index 929b27b..0dcb0fa 100644 > > > --- a/net/ipv4/netfilter.c > > > +++ b/net/ipv4/netfilter.c > > > @@ -63,7 +63,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; > > > > OK, but could you please add a changelog as well ? > > > > Your initial message contained a lot of useful information that could > > help future bug hunting ;) > > BTW, did you acked this patch? > > Let me know, to include it in the changelog. Sure, sorry I missed your mail Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
