| Submitter | Stephen Rothwell |
|---|---|
| Date | Jan. 11, 2012, 12:52 a.m. |
| Message ID | <20120111115217.b5db064c4bf233a4e1df42b8@canb.auug.org.au> |
| Download | mbox | patch |
| Permalink | /patch/135345/ |
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
Comments
On Wed, Jan 11, 2012 at 11:52:17AM +1100, Stephen Rothwell wrote: > 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@canb.auug.org.au> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
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();
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@canb.auug.org.au> --- 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.