tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

netfilter: kill remnants of ulog targets

The ulog targets were recently killed. A few references to the Kconfig
macros CONFIG_IP_NF_TARGET_ULOG and CONFIG_BRIDGE_EBT_ULOG were left
untouched. Kill these too.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Paul Bolle and committed by
Pablo Neira Ayuso d4da843e a2b60c75

-8
-6
include/net/netns/x_tables.h
··· 15 15 struct ebt_table *frame_filter; 16 16 struct ebt_table *frame_nat; 17 17 #endif 18 - #if IS_ENABLED(CONFIG_IP_NF_TARGET_ULOG) 19 - bool ulog_warn_deprecated; 20 - #endif 21 - #if IS_ENABLED(CONFIG_BRIDGE_EBT_ULOG) 22 - bool ebt_ulog_warn_deprecated; 23 - #endif 24 18 }; 25 19 #endif
-1
net/bridge/netfilter/Makefile
··· 37 37 38 38 # watchers 39 39 obj-$(CONFIG_BRIDGE_EBT_LOG) += ebt_log.o 40 - obj-$(CONFIG_BRIDGE_EBT_ULOG) += ebt_ulog.o 41 40 obj-$(CONFIG_BRIDGE_EBT_NFLOG) += ebt_nflog.o
-1
net/ipv4/netfilter/Makefile
··· 57 57 obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o 58 58 obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o 59 59 obj-$(CONFIG_IP_NF_TARGET_SYNPROXY) += ipt_SYNPROXY.o 60 - obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o 61 60 62 61 # generic ARP tables 63 62 obj-$(CONFIG_IP_NF_ARPTABLES) += arp_tables.o