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

Commit d4da843e authored by Paul Bolle's avatar Paul Bolle Committed by Pablo Neira Ayuso
Browse files

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: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent a2b60c75

include/net/netns/x_tables.h

+0 −6
Original line number Diff line number Diff line
@@ -15,11 +15,5 @@ struct netns_xt { 
	struct ebt_table *frame_filter;

	struct ebt_table *frame_nat;

#endif

#if IS_ENABLED(CONFIG_IP_NF_TARGET_ULOG)

	bool ulog_warn_deprecated;

#endif

#if IS_ENABLED(CONFIG_BRIDGE_EBT_ULOG)

	bool ebt_ulog_warn_deprecated;

#endif

};

#endif

net/bridge/netfilter/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -37,5 +37,4 @@ obj-$(CONFIG_BRIDGE_EBT_SNAT) += ebt_snat.o 


# watchers

obj-$(CONFIG_BRIDGE_EBT_LOG) += ebt_log.o

obj-$(CONFIG_BRIDGE_EBT_ULOG) += ebt_ulog.o

obj-$(CONFIG_BRIDGE_EBT_NFLOG) += ebt_nflog.o

net/ipv4/netfilter/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o 
obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o

obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o

obj-$(CONFIG_IP_NF_TARGET_SYNPROXY) += ipt_SYNPROXY.o

obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o



# generic ARP tables

obj-$(CONFIG_IP_NF_ARPTABLES) += arp_tables.o