From c9140f402c62176f486a34291bf52bf86889eb3a Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 22 Mar 2021 17:05:47 +0800 Subject: [PATCH] netfilter: drop kmod-ipt-cgroup This was included in ipt-extra already. Signed-off-by: Tianling Shen --- include/netfilter.mk | 3 --- package/kernel/linux/modules/netfilter.mk | 17 ----------------- package/network/utils/iptables/Makefile | 4 ++-- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/include/netfilter.mk b/include/netfilter.mk index 814d5a2876..bdfdc1c111 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -152,9 +152,6 @@ $(eval $(call nf_add,IPT_IPSEC,CONFIG_NETFILTER_XT_MATCH_POLICY, $(P_XT)xt_polic # flow offload support $(eval $(call nf_add,IPT_FLOW,CONFIG_NETFILTER_XT_TARGET_FLOWOFFLOAD, $(P_XT)xt_FLOWOFFLOAD)) -# cgroup -$(eval $(call nf_add,IPT_CGROUP,CONFIG_NETFILTER_XT_MATCH_CGROUP, $(P_XT)xt_cgroup)) - # IPv6 # kernel only diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index 3bf4e122fb..e818c464fd 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -457,23 +457,6 @@ endef $(eval $(call KernelPackage,ipt-nat)) -define KernelPackage/ipt-cgroup - SUBMENU:=$(NF_MENU) - TITLE:=cgroup netfilter module - KCONFIG:=$(KCONFIG_IPT_CGROUP) - FILES:=$(LINUX_DIR)/net/netfilter/*cgroup*.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,$(notdir $(IPT_CGROUP-m))) - DEPENDS:= kmod-ipt-core -endef - -$(eval $(call KernelPackage,ipt-cgroup)) - -define KernelPackage/ipt-cgroup/description - Kernel support for cgroup netfilter module - Include: - - cgroup -endef - define KernelPackage/ipt-raw TITLE:=Netfilter IPv4 raw table support KCONFIG:=CONFIG_IP_NF_RAW diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile index c357a7b907..97d0a5ca0f 100644 --- a/package/network/utils/iptables/Makefile +++ b/package/network/utils/iptables/Makefile @@ -170,7 +170,7 @@ Includes support for: endef define Package/iptables-mod-cgroup -$(call Package/iptables/Module, +kmod-ipt-cgroup) +$(call Package/iptables/Module, +kmod-ipt-extra) TITLE:=cgroup extension endef @@ -694,7 +694,7 @@ $(eval $(call BuildPlugin,iptables-mod-conntrack-label,$(IPT_CONNTRACK_LABEL-m)) $(eval $(call BuildPlugin,iptables-mod-extra,$(IPT_EXTRA-m))) $(eval $(call BuildPlugin,iptables-mod-physdev,$(IPT_PHYSDEV-m))) $(eval $(call BuildPlugin,iptables-mod-filter,$(IPT_FILTER-m))) -$(eval $(call BuildPlugin,iptables-mod-cgroup,$(IPT_CGROUP-m))) +$(eval $(call BuildPlugin,iptables-mod-cgroup,$(IPT_EXTRA-m))) $(eval $(call BuildPlugin,iptables-mod-imq,$(IPT_IMQ-m))) $(eval $(call BuildPlugin,iptables-mod-ipopt,$(IPT_IPOPT-m))) $(eval $(call BuildPlugin,iptables-mod-ipsec,$(IPT_IPSEC-m)))