diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-05 12:00:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-05 12:00:53 -0700 |
| commit | 356d6c2d55b71303a17910ea2cce3eba8e44bd29 (patch) | |
| tree | 1a55442d61782eabab5682f9a10b4d8694ae650e /net/ipv6 | |
| parent | 86b698b8cba723fc7e7db50f664ccf0d7da57ee1 (diff) | |
| parent | fecc1133b66af6e0cd49115a248f34bbb01f180a (diff) | |
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 14e6724d567..91490ad9302 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; |