From 780f6384c5c6639da3f5a6ac8d30653e8a26d6c0 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Fri, 25 Jun 2010 16:30:52 +0200 Subject: ipset 5: IPv6 port related and manpage fixes, more tests - getting ports for family INET6 fixed - more manpage polishing - tests to check the iptables/ip6tables match and target added --- kernel/include/linux/netfilter/ip_set_getport.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kernel/include/linux/netfilter') 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 -- cgit v1.2.3