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>

diff --git a/package/network/config/firewall4/Makefile b/package/network/config/firewall4/Makefile
index a4f63a91ee8ec5f6b508d10a17ac4dc62e4990d9..57af47062fc9faf7f4df5c76b7ad782395a5e3aa 100644 (file)
--- 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