From: Dash Four <mr.dash.four@googlemail.com>
To: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>,
Netfilter Core Team <netfilter-devel@vger.kernel.org>
Subject: [PATCH 1/4] ipset: minor variable-naming corrections
Date: Wed, 29 May 2013 01:13:21 +0100 [thread overview]
Message-ID: <51A54821.1060903@googlemail.com> (raw)
In-Reply-To: <51A54267.8050402-git-send-email-mr.dash.four@googlemail.com>
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(-)
diff --git a/kernel/net/netfilter/ipset/ip_set_getport.c b/kernel/net/netfilter/ipset/ip_set_getport.c
index 279a03c..6c019b3 100644
--- a/kernel/net/netfilter/ipset/ip_set_getport.c
+++ b/kernel/net/netfilter/ipset/ip_set_getport.c
@@ -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
next parent reply other threads:[~2013-05-29 0:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <51A54267.8050402-git-send-email-mr.dash.four@googlemail.com>
2013-05-29 0:13 ` Dash Four [this message]
2013-05-29 0:13 ` [PATCH 2/4] ipset: add "inner" flag implementation Dash Four
2013-06-01 10:54 ` Jozsef Kadlecsik
2013-06-07 1:13 ` Dash Four
2013-06-09 8:54 ` Jozsef Kadlecsik
2013-05-29 0:13 ` [PATCH 3/4] iptables: add set match "inner" flag support Dash Four
2013-05-29 0:13 ` [PATCH 4/4] iptables (userspace): " Dash Four
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51A54821.1060903@googlemail.com \
--to=mr.dash.four@googlemail.com \
--cc=kadlec@blackhole.kfki.hu \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.