Acked-by: Jarno Rajahalme <jrajaha...@nicira.com>
On Jun 25, 2014, at 8:24 PM, Joe Stringer <joestrin...@nicira.com> wrote:
> These two cases used to be treated differently for IPv4/IPv6, but they
> are now identical.
>
> Signed-off-by: Joe Stringer <joestrin...@nicira.com>
> ---
> datapath/flow_netlink.c | 13 +++----------
> 1 file changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c
> index 5a978f0..5a1a487 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);
> }
>
> --
> 1.7.10.4
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
