hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2026-06-11 04:37:26 -04:00
Code Issues Projects Releases Wiki Activity

netfilter: remove nf-conntrack6

Browse Source 
nf_conntrack_ipv6 is no longer a separate kernel module, so remove it.

Signed-off-by: Qingfang Deng <dqfext@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21612
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Qingfang Deng
2026-01-20 13:57:46 +08:00
committed by Robert Marko
parent a8bdb1e6d6
commit 5b61a50244
4 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/netfilter.mk
View File

@@ -358,7 +358,6 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CONNLIMIT,CONFIG_NFT_CONNLIMIT, $(P_XT)
IPT_BUILTIN += $(NF_IPT-y) $(NF_IPT-m) IPT_BUILTIN += $(NF_IPT-y) $(NF_IPT-m)
IPT_BUILTIN += $(IPT_CORE-y) $(IPT_CORE-m) IPT_BUILTIN += $(IPT_CORE-y) $(IPT_CORE-m)
IPT_BUILTIN += $(NF_CONNTRACK-y) IPT_BUILTIN += $(NF_CONNTRACK-y)
IPT_BUILTIN += $(NF_CONNTRACK6-y)
IPT_BUILTIN += $(IPT_CONNTRACK-y) IPT_BUILTIN += $(IPT_CONNTRACK-y)
IPT_BUILTIN += $(IPT_CONNTRACK_EXTRA-y) IPT_BUILTIN += $(IPT_CONNTRACK_EXTRA-y)
IPT_BUILTIN += $(IPT_EXTRA-y) IPT_BUILTIN += $(IPT_EXTRA-y)

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

@@ -120,23 +120,11 @@ endef
$(eval $(call KernelPackage,nf-conntrack)) $(eval $(call KernelPackage,nf-conntrack))
define KernelPackage/nf-conntrack6
SUBMENU:=$(NF_MENU)
TITLE:=Netfilter IPv6 connection tracking
KCONFIG:=$(KCONFIG_NF_CONNTRACK6)
DEPENDS:=@IPV6 +kmod-nf-conntrack
FILES:=$(foreach mod,$(NF_CONNTRACK6-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_CONNTRACK6-m)))
endef
$(eval $(call KernelPackage,nf-conntrack6))
define KernelPackage/nf-dup-inet define KernelPackage/nf-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
HIDDEN:=1 HIDDEN:=1
DEPENDS:=+kmod-nf-conntrack +IPV6:kmod-nf-conntrack6 DEPENDS:=+kmod-nf-conntrack
KCONFIG:= \ KCONFIG:= \
CONFIG_NF_DUP_IPV4 \ CONFIG_NF_DUP_IPV4 \
CONFIG_NF_DUP_IPV6 CONFIG_NF_DUP_IPV6
@@ -187,7 +175,7 @@ define KernelPackage/nf-nat6
SUBMENU:=$(NF_MENU) SUBMENU:=$(NF_MENU)
TITLE:=Netfilter IPV6-NAT TITLE:=Netfilter IPV6-NAT
KCONFIG:=$(KCONFIG_NF_NAT6) KCONFIG:=$(KCONFIG_NF_NAT6)
DEPENDS:=@IPV6 +kmod-nf-conntrack6 +kmod-nf-nat DEPENDS:=@IPV6 +kmod-nf-nat
FILES:=$(foreach mod,$(NF_NAT6-m),$(LINUX_DIR)/net/$(mod).ko) FILES:=$(foreach mod,$(NF_NAT6-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NAT6-m))) AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NAT6-m)))
endef endef
@@ -1135,7 +1123,7 @@ $(eval $(call KernelPackage,ipt-rpfilter))
define KernelPackage/nft-core define KernelPackage/nft-core
SUBMENU:=$(NF_MENU) SUBMENU:=$(NF_MENU)
TITLE:=Netfilter nf_tables support TITLE:=Netfilter nf_tables support
DEPENDS:=+kmod-nfnetlink +kmod-nf-reject +IPV6:kmod-nf-reject6 +IPV6:kmod-nf-conntrack6 +kmod-nf-nat +kmod-nf-log +IPV6:kmod-nf-log6 +kmod-lib-crc32c DEPENDS:=+kmod-nfnetlink +kmod-nf-reject +IPV6:kmod-nf-reject6 +kmod-nf-nat +kmod-nf-log +IPV6:kmod-nf-log6 +kmod-lib-crc32c
FILES:=$(foreach mod,$(NFT_CORE-m),$(LINUX_DIR)/net/$(mod).ko) FILES:=$(foreach mod,$(NFT_CORE-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_CORE-m))) AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_CORE-m)))
KCONFIG:= \ KCONFIG:= \

2
package/kernel/nat46/Makefile
View File

@@ -15,7 +15,7 @@ PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define KernelPackage/nat46 define KernelPackage/nat46
DEPENDS:=@IPV6 +kmod-nf-conntrack6 DEPENDS:=@IPV6 +kmod-nf-conntrack
TITLE:=Stateless NAT46 translation kernel module TITLE:=Stateless NAT46 translation kernel module
SECTION:=kernel SECTION:=kernel
SUBMENU:=Network Support SUBMENU:=Network Support

2
package/network/config/firewall/Makefile
View File

@@ -30,7 +30,7 @@ define Package/firewall
SECTION:=net SECTION:=net
CATEGORY:=Base system CATEGORY:=Base system
TITLE:=OpenWrt C Firewall TITLE:=OpenWrt C Firewall
DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libiptext +IPV6:libiptext6 +libxtables +kmod-ipt-core +kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +kmod-ipt-nat DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libiptext +IPV6:libiptext6 +libxtables +kmod-ipt-core +kmod-ipt-conntrack +kmod-ipt-nat
PROVIDES:=uci-firewall PROVIDES:=uci-firewall
CONFLICTS:=firewall4 CONFLICTS:=firewall4
endef endef