From cb76e46e97b0013305a7c96c2230a791675a15cf Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Tue, 10 Nov 2009 21:53:19 +0100 Subject: ipset 4.0 released See ChangeLog files --- kernel/include/linux/netfilter_ipv4/ip_set_getport.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kernel/include/linux/netfilter_ipv4/ip_set_getport.h') diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_getport.h b/kernel/include/linux/netfilter_ipv4/ip_set_getport.h index 9e322bf..18ed729 100644 --- a/kernel/include/linux/netfilter_ipv4/ip_set_getport.h +++ b/kernel/include/linux/netfilter_ipv4/ip_set_getport.h @@ -7,7 +7,7 @@ /* We must handle non-linear skbs */ static inline ip_set_ip_t -get_port(const struct sk_buff *skb, u_int32_t flags) +get_port(const struct sk_buff *skb, const u_int32_t *flags) { struct iphdr *iph = ip_hdr(skb); u_int16_t offset = ntohs(iph->frag_off) & IP_OFFSET; @@ -23,7 +23,7 @@ get_port(const struct sk_buff *skb, u_int32_t flags) /* No choice either */ return INVALID_PORT; - return ntohs(flags & IPSET_SRC ? + return ntohs(flags[0] & IPSET_SRC ? tcph.source : tcph.dest); } case IPPROTO_UDP: { @@ -36,7 +36,7 @@ get_port(const struct sk_buff *skb, u_int32_t flags) /* No choice either */ return INVALID_PORT; - return ntohs(flags & IPSET_SRC ? + return ntohs(flags[0] & IPSET_SRC ? udph.source : udph.dest); } default: -- cgit v1.2.3