From: Ben Pfaff Date: Thu, 19 Jul 2012 16:20:49 +0000 (-0700) Subject: meta-flow: Fix mf_get_mask() bug for IPv6 flow label. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=465d9a8fe680218cfd9254c312792e50349f9cd5;p=openvswitch meta-flow: Fix mf_get_mask() bug for IPv6 flow label. Commit 32455024 (OXM: Allow masking of IPv6 Flow Label) made the flow label maskable but did not update mf_get_mask() accordingly. CC: Simon Horman Signed-off-by: Ben Pfaff --- diff --git a/lib/meta-flow.c b/lib/meta-flow.c index 8bc3d1a5..a5505c96 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -647,7 +647,6 @@ mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc, case MFF_IP_DSCP: case MFF_IP_ECN: case MFF_IP_TTL: - case MFF_IPV6_LABEL: case MFF_ARP_OP: case MFF_ARP_SHA: case MFF_ARP_THA: @@ -699,6 +698,9 @@ mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc, case MFF_IPV6_DST: mask->ipv6 = wc->ipv6_dst_mask; break; + case MFF_IPV6_LABEL: + mask->be32 = wc->ipv6_label_mask; + break; case MFF_ND_TARGET: mask->ipv6 = wc->nd_target_mask;