From: Ben Pfaff <blp@nicira.com>
Date: Wed, 24 Aug 2011 22:27:14 +0000 (-0700)
Subject: ofproto-dpif: Fix behavior when a subset of VLANs is trunked.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3b07057fd7f02b4e6bb006bcecff8683237778e;p=openvswitch

ofproto-dpif: Fix behavior when a subset of VLANs is trunked.

Reported-by: Philippe Jung <phil.jung@free.fr>
---

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 98bcc747..bd976f76 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -1119,7 +1119,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);