RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kernel: Extract kmod-nf-dup-inet 

The nf_dup_ipv4.ko and nf_dup_ipv6.ko kernel module were packaged by
kmod-ipt-tee and kmod-nft-dup-inet at the same time. Extract them into a
separate package used by both.

Link: https://github.com/openwrt/openwrt/pull/15833
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit b0953c4fbf)
Link: https://github.com/openwrt/openwrt/pull/15898
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens 2024-06-29 17:24:09 +02:00
parent e82759fd67
commit 1f701c9b04
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/netfilter.mk
View File

@ -253,8 +253,6 @@ $(eval $(call nf_add,IPT_LED,CONFIG_NETFILTER_XT_TARGET_LED, $(P_XT)xt_LED))
# tee # tee
$(eval $(call nf_add,IPT_TEE,CONFIG_NETFILTER_XT_TARGET_TEE, $(P_XT)xt_TEE)) $(eval $(call nf_add,IPT_TEE,CONFIG_NETFILTER_XT_TARGET_TEE, $(P_XT)xt_TEE))
$(eval $(if $(NF_KMOD),$(call nf_add,IPT_TEE,CONFIG_NF_DUP_IPV4, $(P_V4)nf_dup_ipv4),))
$(eval $(if $(NF_KMOD),$(call nf_add,IPT_TEE,CONFIG_NF_DUP_IPV6, $(P_V6)nf_dup_ipv6),))
# u32 # u32

26
package/kernel/linux/modules/netfilter.mk
View File

@ -132,6 +132,22 @@ endef
$(eval $(call KernelPackage,nf-conntrack6)) $(eval $(call KernelPackage,nf-conntrack6))
define KernelPackage/nf-dup-inet
SUBMENU:=$(NF_MENU)
TITLE:=Netfilter nf_tables dup in ip/ip6/inet family support
HIDDEN:=1
DEPENDS:=+kmod-nf-conntrack +IPV6:kmod-nf-conntrack6
KCONFIG:= \
CONFIG_NF_DUP_IPV4 \
CONFIG_NF_DUP_IPV6
FILES:= \
$(LINUX_DIR)/net/ipv4/netfilter/nf_dup_ipv4.ko \
$(LINUX_DIR)/net/ipv6/netfilter/nf_dup_ipv6.ko
endef
$(eval $(call KernelPackage,nf-dup-inet))
define KernelPackage/nf-log define KernelPackage/nf-log
SUBMENU:=$(NF_MENU) SUBMENU:=$(NF_MENU)
TITLE:=Netfilter Logging TITLE:=Netfilter Logging
@ -716,7 +732,7 @@ $(eval $(call KernelPackage,ipt-tproxy))
define KernelPackage/ipt-tee define KernelPackage/ipt-tee
TITLE:=TEE support TITLE:=TEE support
DEPENDS:=+kmod-ipt-conntrack DEPENDS:=+kmod-ipt-conntrack +kmod-nf-dup-inet
KCONFIG:=$(KCONFIG_IPT_TEE) KCONFIG:=$(KCONFIG_IPT_TEE)
FILES:=$(foreach mod,$(IPT_TEE-m),$(LINUX_DIR)/net/$(mod).ko) FILES:=$(foreach mod,$(IPT_TEE-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir nf_tee $(IPT_TEE-m))) AUTOLOAD:=$(call AutoProbe,$(notdir nf_tee $(IPT_TEE-m)))
@ -1150,18 +1166,14 @@ $(eval $(call KernelPackage,nft-bridge))
define KernelPackage/nft-dup-inet define KernelPackage/nft-dup-inet
SUBMENU:=$(NF_MENU) SUBMENU:=$(NF_MENU)
TITLE:=Netfilter nf_tables dup in ip/ip6/inet family support TITLE:=Netfilter nf_tables dup in ip/ip6/inet family support
DEPENDS:=+kmod-nft-core +kmod-nf-conntrack +IPV6:kmod-nf-conntrack6 DEPENDS:=+kmod-nft-core +kmod-nf-dup-inet
KCONFIG:= \ KCONFIG:= \
CONFIG_NF_DUP_IPV4 \
CONFIG_NF_DUP_IPV6 \
CONFIG_NFT_DUP_IPV4 \ CONFIG_NFT_DUP_IPV4 \
CONFIG_NFT_DUP_IPV6 CONFIG_NFT_DUP_IPV6
FILES:= \ FILES:= \
$(LINUX_DIR)/net/ipv4/netfilter/nf_dup_ipv4.ko \
$(LINUX_DIR)/net/ipv6/netfilter/nf_dup_ipv6.ko \
$(LINUX_DIR)/net/ipv4/netfilter/nft_dup_ipv4.ko \ $(LINUX_DIR)/net/ipv4/netfilter/nft_dup_ipv4.ko \
$(LINUX_DIR)/net/ipv6/netfilter/nft_dup_ipv6.ko $(LINUX_DIR)/net/ipv6/netfilter/nft_dup_ipv6.ko
AUTOLOAD:=$(call AutoProbe,nf_dup_ipv4 nf_dup_ipv6 nft_dup_ipv4 nft_dup_ipv6) AUTOLOAD:=$(call AutoProbe,nft_dup_ipv4 nft_dup_ipv6)
endef endef
$(eval $(call KernelPackage,nft-dup-inet)) $(eval $(call KernelPackage,nft-dup-inet))