summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2018-03-28 10:38:12 +0200
committerFlorian Westphal <fw@strlen.de>2018-03-28 11:26:29 +0200
commitec2048961c100fdadf7102c70f1519f71dc35ecb (patch)
tree248b12a76c51cf85c2b0e8d279441d76cb5c5c35
parent1e173590ef999f110f90112573f5c590088165b0 (diff)
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>
-rw-r--r--src/payload.c9
1 files changed, 0 insertions, 9 deletions
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: