[ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

[Ben Pfaff]

It doesn't apply directly to branch-1.11.  Can you take a look and see
whether there's some other commit we're missing there?

Thanks,

Ben.

On Fri, Aug 30, 2013 at 11:09:21AM -0700, Andy Zhou wrote:
> Yes, this patch fixes a bug.
> 
> 
> On Fri, Aug 30, 2013 at 11:06 AM, Ben Pfaff <blp at nicira.com> wrote:
> 
> > On Fri, Aug 30, 2013 at 11:03:24AM -0700, Andy Zhou wrote:
> > > On Fri, Aug 30, 2013 at 11:01 AM, Ben Pfaff <blp at nicira.com> wrote:
> > >
> > > > On Fri, Aug 30, 2013 at 09:57:13AM -0700, gyang at nicira.com wrote:
> > > > > @@ -2981,7 +2986,8 @@ parse_l2_5_onward(const struct nlattr
> > > > *attrs[OVS_KEY_ATTR_MAX + 1],
> > > > >                      if (is_mask) {
> > > > >                          if (!is_all_zeros((const uint8_t *) nd_key,
> > > > >                                            sizeof *nd_key) &&
> > > > > -                            flow->tp_src != htons(0xffff)) {
> > > >
> > > > I suspect that && here should be ||.  Is that correct?  If so, then
> > > > I'll update the patch and commit this:
> > > >
> > > I agree. I was planing on send out a separate patch for this.
> >
> > Thanks, I folded that in and applied this to master and branch-2.0.
> > Do we want it on branch-1.11 also?
> >