diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2014-12-29 22:28:17 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2015-01-06 08:25:09 +0100 |
| commit | f1d7b4b97f82c5fb912e0857818cbec07d264b23 (patch) | |
| tree | 034c4d665ccd1c1e1ae64b066e2c65580547619d /kernel/net/netfilter/ipset/ip_set_getport.c | |
| parent | f5faf94ec994b470ad4a23daa0218a75c5003f46 (diff) | |
More compatibility checking and simplifications
Try hard to keep the support of the 2.6.32 kernel tree and
simplify the code with self-referential macros.
Diffstat (limited to 'kernel/net/netfilter/ipset/ip_set_getport.c')
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_getport.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_getport.c b/kernel/net/netfilter/ipset/ip_set_getport.c index 956c84a..4d9a2c0 100644 --- a/kernel/net/netfilter/ipset/ip_set_getport.c +++ b/kernel/net/netfilter/ipset/ip_set_getport.c @@ -140,12 +140,8 @@ ip_set_get_ip6_port(const struct sk_buff *skb, bool src, __be16 frag_off = 0; nexthdr = ipv6_hdr(skb)->nexthdr; -#if HAVE_IPV6_SKIP_EXTHDR_ARGS == 4 protoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr, &frag_off); -#else - protoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr); -#endif if (protoff < 0 || (frag_off & htons(~0x7)) != 0) return false; |