[PATCH] netfilter: fix unused variable warning in xt_hashlimit.c

From: Stephen Rothwell
Date: Tue Jan 10 2012 - 19:52:27 EST


Fixes this warning when CONFIG_IP6_NF_IPTABLES is not enabled:

net/netfilter/xt_hashlimit.c: In function âhashlimit_init_dstâ:
net/netfilter/xt_hashlimit.c:448:9: warning: unused variable âfrag_offâ [-Wunused-variable]

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
net/netfilter/xt_hashlimit.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

Sorry for the wide posting, but the MAINTAINERS file is not clear about
which mailing lists are relevant.

diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 8e49921..d95f9c9 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -445,7 +445,6 @@ hashlimit_init_dst(const struct xt_hashlimit_htable *hinfo,
{
__be16 _ports[2], *ports;
u8 nexthdr;
- __be16 frag_off;
int poff;

memset(dst, 0, sizeof(*dst));
@@ -466,6 +465,9 @@ hashlimit_init_dst(const struct xt_hashlimit_htable *hinfo,
break;
#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
case NFPROTO_IPV6:
+ {
+ __be16 frag_off;
+
if (hinfo->cfg.mode & XT_HASHLIMIT_HASH_DIP) {
memcpy(&dst->ip6.dst, &ipv6_hdr(skb)->daddr,
sizeof(dst->ip6.dst));
@@ -485,6 +487,7 @@ hashlimit_init_dst(const struct xt_hashlimit_htable *hinfo,
if ((int)protoff < 0)
return -1;
break;
+ }
#endif
default:
BUG();
--
1.7.8.197.g73c6b

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature