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

Ben Pfaff blp at nicira.com
Fri Aug 30 20:19:53 UTC 2013


I still get conflicts:

    blp at sigsegv:~/ovs$ git checkout openvswitch/branch-1.11
    HEAD is now at 37f9d3a... Set release date for 1.11.0.
    blp at sigsegv:~/ovs$ git cherry-pick 4a2216156e6e168
    error: could not apply 4a22161... odp-util: New function odp_flow_key_to_mask().
    hint: after resolving the conflicts, mark the corrected paths
    hint: with 'git add <paths>' or 'git rm <paths>'
    hint: and commit the result with 'git commit'
    blp at sigsegv:~/ovs$ 

On Fri, Aug 30, 2013 at 01:15:49PM -0700, Andy Zhou wrote:
> May be it caused by missing commit 4a2216156e6e168 ?
> 
> 
> On Fri, Aug 30, 2013 at 11:11 AM, Ben Pfaff <blp at nicira.com> wrote:
> 
> > 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?
> > > >
> >



More information about the dev mailing list