Patchwork [-next] netfilter: tproxy: fix build with IP6_NF_IPTABLES=n

login
register
mail settings
Submitter Florian Westphal
Date Aug. 4, 2013, 9:37 a.m.
Message ID <1375609049-28517-1-git-send-email-fw@strlen.de>
Download mbox | patch
Permalink /patch/264469/
State Accepted
Headers show

Comments

Florian Westphal - Aug. 4, 2013, 9:37 a.m.
after commit 93742cf8af9dd3b053242b273040aa35fcbf93b3
(netfilter: tproxy: remove nf_tproxy_core.h)
CONFIG_IPV6=y
CONFIG_IP6_NF_IPTABLES=n
gives us:

net/netfilter/xt_TPROXY.c: In function 'nf_tproxy_get_sock_v6':
net/netfilter/xt_TPROXY.c:178:4: error: implicit declaration of function 'inet6_lookup_listener'

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
---
Pablo Neira - Aug. 5, 2013, 11:05 a.m.
On Sun, Aug 04, 2013 at 11:37:29AM +0200, Florian Westphal wrote:
> after commit 93742cf8af9dd3b053242b273040aa35fcbf93b3
> (netfilter: tproxy: remove nf_tproxy_core.h)
> CONFIG_IPV6=y
> CONFIG_IP6_NF_IPTABLES=n
> gives us:
> 
> net/netfilter/xt_TPROXY.c: In function 'nf_tproxy_get_sock_v6':
> net/netfilter/xt_TPROXY.c:178:4: error: implicit declaration of function 'inet6_lookup_listener'

Applied, thanks Florian.
--
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

Patch

diff --git a/net/netfilter/xt_TPROXY.c b/net/netfilter/xt_TPROXY.c
index 851383a..5d8a3a3 100644
--- a/net/netfilter/xt_TPROXY.c
+++ b/net/netfilter/xt_TPROXY.c
@@ -161,7 +161,7 @@  nf_tproxy_get_sock_v4(struct net *net, const u8 protocol,
 	return sk;
 }
 
-#if IS_ENABLED(CONFIG_IPV6)
+#ifdef XT_TPROXY_HAVE_IPV6
 static inline struct sock *
 nf_tproxy_get_sock_v6(struct net *net, const u8 protocol,
 		      const struct in6_addr *saddr, const struct in6_addr *daddr,