@@ -133,7 +133,7 @@ bool
ip_set_get_ip6_port(const struct sk_buff *skb, bool src,
__be16 *port, u8 *proto)
{
- int protoff;
+ int protooff;
u8 nexthdr;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
__be16 frag_off;
@@ -141,15 +141,15 @@ ip_set_get_ip6_port(const struct sk_buff *skb, bool src,
nexthdr = ipv6_hdr(skb)->nexthdr;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
- protoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr,
+ protooff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr,
&frag_off);
#else
- protoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr);
+ protooff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr);
#endif
- if (protoff < 0)
+ if (protooff < 0)
return false;
- return get_port(skb, nexthdr, protoff, src, port, proto);
+ return get_port(skb, nexthdr, protooff, src, port, proto);
}
EXPORT_SYMBOL_GPL(ip_set_get_ip6_port);
#endif
This patch corrects minor variable-naming inconsistencies in net/netfilter/ipset/ip_set_getport.c Signed-off-by: Dash Four <mr.dash.four@googlemail.com> --- kernel/net/netfilter/ipset/ip_set_getport.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html