openvswitch: 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>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>

1 files changed, 3 insertions, 10 deletions

diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index 569309c49cc0..5a91d792505d 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -611,7 +611,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)
@@ -764,15 +763,9 @@ static int ovs_key_from_nlattrs(struct sw_flow_match *match, u64 attrs,
         }
 
         if (attrs & (1 << OVS_KEY_ATTR_TCP_FLAGS)) {
-                if (orig_attrs & (1 << 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 &= ~(1 << OVS_KEY_ATTR_TCP_FLAGS);
         }