]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
Revert "payload: don't remove icmp family dependency in special cases"
authorFlorian Westphal <fw@strlen.de>
Wed, 28 Mar 2018 08:38:12 +0000 (10:38 +0200)
committerFlorian Westphal <fw@strlen.de>
Wed, 28 Mar 2018 09:26:29 +0000 (11:26 +0200)
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>
src/payload.c

index 34202d1809ef4e5c0f60af32abf4d44b094a60e5..09665a0e815689111a23415bf608ac28a1c4915c 100644 (file)
@@ -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: