diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-05 21:00:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-05 21:00:53 +0200 |
| commit | 356d6c2d55b71303a17910ea2cce3eba8e44bd29 (patch) | |
| tree | 1a55442d61782eabab5682f9a10b4d8694ae650e /net/ipv6 | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| parent | netfilter: ctnetlink: fix wrong message type in user updates (diff) | |
| download | linux-356d6c2d55b71303a17910ea2cce3eba8e44bd29.tar.xz linux-356d6c2d55b71303a17910ea2cce3eba8e44bd29.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/ip6t_ipv6header.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/netfilter/ip6t_ipv6header.c b/net/ipv6/netfilter/ip6t_ipv6header.c index 14e6724d5672..91490ad9302c 100644 --- a/net/ipv6/netfilter/ip6t_ipv6header.c +++ b/net/ipv6/netfilter/ip6t_ipv6header.c @@ -50,14 +50,14 @@ ipv6header_mt6(const struct sk_buff *skb, const struct xt_match_param *par) struct ipv6_opt_hdr _hdr; int hdrlen; - /* Is there enough space for the next ext header? */ - if (len < (int)sizeof(struct ipv6_opt_hdr)) - return false; /* No more exthdr -> evaluate */ if (nexthdr == NEXTHDR_NONE) { temp |= MASK_NONE; break; } + /* Is there enough space for the next ext header? */ + if (len < (int)sizeof(struct ipv6_opt_hdr)) + return false; /* ESP -> evaluate */ if (nexthdr == NEXTHDR_ESP) { temp |= MASK_ESP; |