From ec2048961c100fdadf7102c70f1519f71dc35ecb Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Wed, 28 Mar 2018 10:38:12 +0200 Subject: 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 --- src/payload.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src') 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: -- cgit v1.2.3