From: Florian Westphal <fw@strlen.de>
Date: Wed, 28 Mar 2018 08:38:12 +0000 (+0200)
Subject: Revert "payload: don't remove icmp family dependency in special cases"
X-Git-Tag: v0.8.4~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec2048961c100fdadf7102c70f1519f71dc35ecb;p=thirdparty%2Fnftables.git

Revert "payload: don't remove icmp family dependency in special cases"

This reverts commit 126706c23c0458b07d54550dc27561b30f8a43f2.

As its now ok to use icmp-in-ip6 family we can remove the dependency.

Signed-off-by: Florian Westphal <fw@strlen.de>
---

diff --git a/src/payload.c b/src/payload.c
index 34202d18..09665a0e 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -467,15 +467,6 @@ static bool payload_may_dependency_kill(struct payload_dep_ctx *ctx,
 	 * IPv6 for the bridge, inet and netdev families.
 	 */
 	switch (family) {
-	case NFPROTO_IPV4:
-	case NFPROTO_IPV6:
-		if (expr->payload.desc == &proto_icmp &&
-		    family != NFPROTO_IPV4)
-			return false;
-		if (expr->payload.desc == &proto_icmp6 &&
-		    family != NFPROTO_IPV6)
-			return false;
-		break;
 	case NFPROTO_BRIDGE:
 	case NFPROTO_NETDEV:
 	case NFPROTO_INET: