aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2021-11-06 15:24:34 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2022-01-06 14:53:47 +0200
commit3d4acc34bb58131804c018271ada6a535d7405e2 (patch)
treeea1f2ffb5651f8492e5a1d069a5e6575d4eb8e32
parentb61d756b6c8fedb7094ec29198dd3dbba49a1807 (diff)
downloadupstream-3d4acc34bb58131804c018271ada6a535d7405e2.tar.gz
upstream-3d4acc34bb58131804c018271ada6a535d7405e2.tar.bz2
upstream-3d4acc34bb58131804c018271ada6a535d7405e2.zip
firewall4: drop kmod-ipt-nat from CONFLICTS
The limitation of not being able to use iptables and nft nat at the same time exists only in kernels before 4.18. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> Reviewed-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--package/network/config/firewall4/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/network/config/firewall4/Makefile b/package/network/config/firewall4/Makefile
index a4f63a91ee..57af47062f 100644
--- a/package/network/config/firewall4/Makefile
+++ b/package/network/config/firewall4/Makefile
@@ -22,7 +22,7 @@ define Package/firewall4
CATEGORY:=Base system
TITLE:=OpenWrt 4th gen firewall
DEPENDS:=+ucode +ucode-mod-fs +ucode-mod-uci +ucode-mod-ubus +kmod-nft-core +kmod-nft-fib +kmod-nft-nat +kmod-nft-nat6 +nftables-json
- CONFLICTS:=firewall kmod-ipt-nat
+ CONFLICTS:=firewall
endef
define Package/firewall4/description