diff options
| author | Joe Stringer <joestringer@nicira.com> | 2014-06-26 11:24:24 +0000 |
|---|---|---|
| committer | Joe Stringer <joestringer@nicira.com> | 2014-06-27 10:44:11 +1200 |
| commit | cab29271f01745308c2a8610bbbc8c10311b156e (patch) | |
| tree | 85061149d87e14e17a63b2a57ab728dd41195e8b /datapath | |
| parent | a48fd8ebd39fb1645d8e7d0b33b6f5cdd1302b2e (diff) | |
datapath: Remove redundant tcp_flags code.
These two cases used to be treated differently for IPv4/IPv6, but they
are now identical.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Diffstat (limited to 'datapath')
| -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); } |