diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-06-25 16:30:52 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-06-25 16:30:52 +0200 |
| commit | 780f6384c5c6639da3f5a6ac8d30653e8a26d6c0 (patch) | |
| tree | 9c8091a4d0a01f0f3216dd5758bf4d07e81cb843 /kernel | |
| parent | 020936c8c3375e1efe44a3087c891a4b2cbfe044 (diff) | |
ipset 5: IPv6 port related and manpage fixes, more testsv5.0-pre4
- getting ports for family INET6 fixed
- more manpage polishing
- tests to check the iptables/ip6tables match and target added
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/include/linux/netfilter/ip_set_getport.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/include/linux/netfilter/ip_set_getport.h b/kernel/include/linux/netfilter/ip_set_getport.h index 680a89a..cf150d3 100644 --- a/kernel/include/linux/netfilter/ip_set_getport.h +++ b/kernel/include/linux/netfilter/ip_set_getport.h @@ -69,18 +69,18 @@ get_ip4_port(const struct sk_buff *skb, bool src, u16 *port, u8 *proto) static inline bool get_ip6_port(const struct sk_buff *skb, bool src, u16 *port, u8 *proto) { - unsigned int *protooff = 0; + unsigned int protooff = 0; int protocol; unsigned short fragoff; - protocol = ipv6_find_hdr(skb, protooff, -1, &fragoff); + protocol = ipv6_find_hdr(skb, &protooff, -1, &fragoff); if (protocol < 0 || fragoff) return false; if (!(*proto >= IPSET_IPPROTO_TCPUDP || *proto == protocol)) return false; - return get_port(skb, protocol, *protooff, src, port, proto); + return get_port(skb, protocol, protooff, src, port, proto); } static inline bool |