diff options
| -rw-r--r-- | datapath/flow_netlink.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c index 5a978f059..5a1a4878e 100644 --- a/datapath/flow_netlink.c +++ b/datapath/flow_netlink.c @@ -587,7 +587,6 @@ static int ovs_key_from_nlattrs(struct sw_flow_match *match, u64 attrs, const struct nlattr **a, bool is_mask) { int err; - u64 orig_attrs = attrs; err = metadata_from_nlattrs(match, &attrs, a, is_mask); if (err) @@ -740,15 +739,9 @@ static int ovs_key_from_nlattrs(struct sw_flow_match *match, u64 attrs, } if (attrs & (1ULL << OVS_KEY_ATTR_TCP_FLAGS)) { - if (orig_attrs & (1ULL << OVS_KEY_ATTR_IPV4)) { - SW_FLOW_KEY_PUT(match, tp.flags, - nla_get_be16(a[OVS_KEY_ATTR_TCP_FLAGS]), - is_mask); - } else { - SW_FLOW_KEY_PUT(match, tp.flags, - nla_get_be16(a[OVS_KEY_ATTR_TCP_FLAGS]), - is_mask); - } + SW_FLOW_KEY_PUT(match, tp.flags, + nla_get_be16(a[OVS_KEY_ATTR_TCP_FLAGS]), + is_mask); attrs &= ~(1ULL << OVS_KEY_ATTR_TCP_FLAGS); } |