netfilter: Fix build errors with xt_socket.c
authorDavid S. Miller <davem@davemloft.net>
Thu, 5 Sep 2013 18:38:03 +0000 (14:38 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Sep 2013 18:38:03 +0000 (14:38 -0400)
As reported by Randy Dunlap:

====================
when CONFIG_IPV6=m
and CONFIG_NETFILTER_XT_MATCH_SOCKET=y:

net/built-in.o: In function `socket_mt6_v1_v2':
xt_socket.c:(.text+0x51b55): undefined reference to `udp6_lib_lookup'
net/built-in.o: In function `socket_mt_init':
xt_socket.c:(.init.text+0x1ef8): undefined reference to `nf_defrag_ipv6_enable'
====================

Like several other modules under net/netfilter/ we have to
have a dependency "IPV6 disabled or set compatibly with this
module" clause.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/Kconfig

index 62a171ab204f46ed1f0f9a55840db91d3ce076e6..6e839b6dff2b1349f86d87837e0a91bb486cc4bf 100644 (file)
@@ -1175,6 +1175,7 @@ config NETFILTER_XT_MATCH_SOCKET
        depends on NETFILTER_XTABLES
        depends on NETFILTER_ADVANCED
        depends on !NF_CONNTRACK || NF_CONNTRACK
+       depends on (IPV6 || IPV6=n)
        select NF_DEFRAG_IPV4
        select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES
        help