Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d67b24c4 authored by Harald Welte's avatar Harald Welte Committed by David S. Miller
Browse files

[NETFILTER]: Fix ip[6]t_NFQUEUE Kconfig dependency 



We have to introduce a separate Kconfig menu entry for the NFQUEUE targets.
They cannot "just" depend on nfnetlink_queue, since nfnetlink_queue could
be linked into the kernel, whereas iptables can be a module.

Signed-off-by: default avatarHarald Welte <laforge@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ef6bd6eb

net/ipv4/netfilter/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -537,6 +537,17 @@ config IP_NF_TARGET_TCPMSS 


	  To compile it as a module, choose M here.  If unsure, say N.



config IP_NF_TARGET_NFQUEUE

	tristate "NFQUEUE Target Support"

	depends on IP_NF_IPTABLES

	help

	  This Target replaced the old obsolete QUEUE target.



	  As opposed to QUEUE, it supports 65535 different queues,

	  not just one.



	  To compile it as a module, choose M here.  If unsure, say N.



# NAT + specific targets

config IP_NF_NAT

	tristate "Full NAT"

net/ipv4/netfilter/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS.o 
obj-$(CONFIG_IP_NF_TARGET_NOTRACK) += ipt_NOTRACK.o

obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o

obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o

obj-$(CONFIG_IP_NF_TARGET_NFQUEUE) += ipt_NFQUEUE.o



# generic ARP tables

obj-$(CONFIG_IP_NF_ARPTABLES) += arp_tables.o
@@ -101,4 +102,3 @@ obj-$(CONFIG_IP_NF_ARP_MANGLE) += arpt_mangle.o 
obj-$(CONFIG_IP_NF_ARPFILTER) += arptable_filter.o



obj-$(CONFIG_IP_NF_QUEUE) += ip_queue.o
 
obj-$(CONFIG_NETFILTER_NETLINK_QUEUE) += ipt_NFQUEUE.o

net/ipv6/netfilter/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -209,6 +209,17 @@ config IP6_NF_TARGET_REJECT 


	  To compile it as a module, choose M here.  If unsure, say N.



config IP6_NF_TARGET_NFQUEUE

	tristate "NFQUEUE Target Support"

	depends on IP_NF_IPTABLES

	help

	  This Target replaced the old obsolete QUEUE target.



	  As opposed to QUEUE, it supports 65535 different queues,

	  not just one.



	  To compile it as a module, choose M here.  If unsure, say N.



#  if [ "$CONFIG_IP6_NF_FILTER" != "n" ]; then

#    dep_tristate '    REJECT target support' CONFIG_IP6_NF_TARGET_REJECT $CONFIG_IP6_NF_FILTER

#    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then

net/ipv6/netfilter/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o 
obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o

obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t_MARK.o

obj-$(CONFIG_IP6_NF_TARGET_HL) += ip6t_HL.o

obj-$(CONFIG_IP6_NF_TARGET_NFQUEUE) += ip6t_NFQUEUE.o

obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o

obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o

obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o

obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o

obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o
 
obj-$(CONFIG_NETFILTER_NETLINK_QUEUE) += ip6t_NFQUEUE.o