[ovs-dev] [PATCH 4/6] odp-util: Drop special case for OVS_KEY_ATTR_TUNNEL for exact mask checks.

[Ben Pfaff]

This special case isn't actually necessary.  Commit 48954dab23ee
("odp-util: Remove last use of odp_tun_key_from_attr for formatting.")
retained it "as a safety measure" but that isn't really needed.

This makes an upcoming change more straightforward.

Signed-off-by: Ben Pfaff <blp at ovn.org>
---
 lib/odp-util.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/odp-util.c b/lib/odp-util.c
index 7f3630d6e718..51490ba4a5cc 100644
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -2210,9 +2210,6 @@ odp_mask_is_exact(enum ovs_key_attr attr, const void *mask, size_t size)
             && ipv6_mask_is_exact(&ipv6_mask->ipv6_src)
             && ipv6_mask_is_exact(&ipv6_mask->ipv6_dst);
     }
-    if (attr == OVS_KEY_ATTR_TUNNEL) {
-        return false;
-    }
 
     if (attr == OVS_KEY_ATTR_ARP) {
         /* ARP key has padding, ignore it. */
@@ -2230,8 +2227,7 @@ static bool
 odp_mask_attr_is_exact(const struct nlattr *ma)
 {
     enum ovs_key_attr attr = nl_attr_type(ma);
-    return (attr != OVS_KEY_ATTR_TUNNEL
-            && odp_mask_is_exact(attr, nl_attr_get(ma), nl_attr_get_size(ma)));
+    return odp_mask_is_exact(attr, nl_attr_get(ma), nl_attr_get_size(ma));
 }
 
 void
-- 
2.10.2