mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

odp-util: Drop special case for OVS_KEY_ATTR_TUNNEL for exact mask checks.

Browse Source 
This special case isn't actually necessary.  Commit 48954dab23
("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@ovn.org>
Acked-by: Andy Zhou <azhou@ovn.org>
This commit is contained in:
Ben Pfaff
2017-07-31 09:40:57 -07:00
parent dade5d766d
commit a4e8ed0c7f
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/odp-util.c
View File

@@ -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