Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b760fb9 authored by Joe Stringer's avatar Joe Stringer Committed by Pravin B Shelar
Browse files

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: default avatarJoe Stringer <joestringer@nicira.com>
Acked-by: default avatarJarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
parent 9b996e54

net/openvswitch/flow_netlink.c

+3 −10
Original line number Diff line number Diff line
@@ -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);

		}

		attrs &= ~(1 << OVS_KEY_ATTR_TCP_FLAGS);

	}