Skip to content

Commit 557fbb8

Browse files
haukecoolsnowwolf
authored andcommitted
kernel: kmod-ipt-ulog: Remove package
The ulog iptables target was removed with kernel 3.17, remove the kernel and also the iptables package in OpenWrt too. Signed-off-by: Hauke Mehrtens <[email protected]>
1 parent 6b48037 commit 557fbb8

File tree

3 files changed

+0
-38
lines changed

3 files changed

+0
-38
lines changed

include/netfilter.mk

-7
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,6 @@ $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_IRC, $(P_XT)nf_connt
230230
$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_IRC, $(P_XT)nf_nat_irc))
231231

232232

233-
# ulog
234-
235-
$(eval $(call nf_add,IPT_ULOG,CONFIG_IP_NF_TARGET_ULOG, $(P_V4)ipt_ULOG))
236-
237-
238233
# nflog
239234

240235
$(eval $(call nf_add,IPT_NFLOG,CONFIG_NETFILTER_XT_TARGET_NFLOG, $(P_XT)xt_NFLOG))
@@ -321,7 +316,6 @@ $(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_SNAT, $(P_EBT)ebt_snat))
321316

322317
# watchers
323318
$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_LOG, $(P_EBT)ebt_log))
324-
$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_ULOG, $(P_EBT)ebt_ulog))
325319
$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_NFLOG, $(P_EBT)ebt_nflog))
326320
$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_NFQUEUE, $(P_EBT)ebt_nfqueue))
327321

@@ -393,7 +387,6 @@ IPT_BUILTIN += $(IPT_NAT6-y)
393387
IPT_BUILTIN += $(IPT_NAT_EXTRA-y)
394388
IPT_BUILTIN += $(NF_NATHELPER-y)
395389
IPT_BUILTIN += $(NF_NATHELPER_EXTRA-y)
396-
IPT_BUILTIN += $(IPT_ULOG-y)
397390
IPT_BUILTIN += $(IPT_TPROXY-y)
398391
IPT_BUILTIN += $(NFNETLINK-y)
399392
IPT_BUILTIN += $(NFNETLINK_LOG-y)

package/kernel/linux/modules/netfilter.mk

-17
Original file line numberDiff line numberDiff line change
@@ -604,23 +604,6 @@ endef
604604
$(eval $(call KernelPackage,nf-nathelper-extra))
605605

606606

607-
define KernelPackage/ipt-ulog
608-
TITLE:=Module for user-space packet logging
609-
KCONFIG:=$(KCONFIG_IPT_ULOG)
610-
FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).ko)
611-
AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_ULOG-m)))
612-
$(call AddDepends/ipt)
613-
endef
614-
615-
define KernelPackage/ipt-ulog/description
616-
Netfilter (IPv4) module for user-space packet logging
617-
Includes:
618-
- ULOG
619-
endef
620-
621-
$(eval $(call KernelPackage,ipt-ulog))
622-
623-
624607
define KernelPackage/ipt-nflog
625608
TITLE:=Module for user-space packet logging
626609
KCONFIG:=$(KCONFIG_IPT_NFLOG)

package/network/utils/iptables/Makefile

-14
Original file line numberDiff line numberDiff line change
@@ -222,19 +222,6 @@ iptables extensions for extra NAT targets.
222222
- NETMAP
223223
endef
224224

225-
define Package/iptables-mod-ulog
226-
$(call Package/iptables/Module, +kmod-ipt-ulog)
227-
TITLE:=user-space packet logging
228-
endef
229-
230-
define Package/iptables-mod-ulog/description
231-
iptables extensions for user-space packet logging.
232-
233-
Targets:
234-
- ULOG
235-
236-
endef
237-
238225
define Package/iptables-mod-nflog
239226
$(call Package/iptables/Module, +kmod-nfnetlink-log +kmod-ipt-nflog)
240227
TITLE:=Netfilter NFLOG target
@@ -684,7 +671,6 @@ $(eval $(call BuildPlugin,iptables-mod-nat-extra,$(IPT_NAT_EXTRA-m)))
684671
$(eval $(call BuildPlugin,iptables-mod-iprange,$(IPT_IPRANGE-m)))
685672
$(eval $(call BuildPlugin,iptables-mod-cluster,$(IPT_CLUSTER-m)))
686673
$(eval $(call BuildPlugin,iptables-mod-clusterip,$(IPT_CLUSTERIP-m)))
687-
$(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m)))
688674
$(eval $(call BuildPlugin,iptables-mod-hashlimit,$(IPT_HASHLIMIT-m)))
689675
$(eval $(call BuildPlugin,iptables-mod-rpfilter,$(IPT_RPFILTER-m)))
690676
$(eval $(call BuildPlugin,iptables-mod-led,$(IPT_LED-m)))

0 commit comments

Comments
 (0)