Thanks, I pushed this patch to master and branch-1.2.

Patch 1 has already been committed as part of another series.

Patches 3, 4, and 5 still need review.

On Thu, Sep 15, 2011 at 04:09:05PM -0700, Ethan Jackson wrote:
> Looks good,
> 
> Ethan
> 
> On Fri, Aug 26, 2011 at 13:19, Ben Pfaff <b...@nicira.com> wrote:
> > Reported-by: Philippe Jung <phil.j...@free.fr>
> > ---
> > ?ofproto/ofproto-dpif.c | ? ?2 +-
> > ?1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
> > index f09c230..c05ca9e 100644
> > --- a/ofproto/ofproto-dpif.c
> > +++ b/ofproto/ofproto-dpif.c
> > @@ -1056,7 +1056,7 @@ bundle_set(struct ofproto *ofproto_, void *aux,
> > ? ? }
> >
> > ? ? /* Get trunked VLANs. */
> > - ? ?trunks = s->vlan == -1 ? NULL : s->trunks;
> > + ? ?trunks = s->vlan == -1 ? s->trunks : NULL;
> > ? ? if (!vlan_bitmap_equal(trunks, bundle->trunks)) {
> > ? ? ? ? free(bundle->trunks);
> > ? ? ? ? bundle->trunks = vlan_bitmap_clone(trunks);
> > --
> > 1.7.4.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

Reply via email to