summaryrefslogtreecommitdiff
path: root/ofproto
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2011-08-24 15:27:14 -0700
committerBen Pfaff <blp@nicira.com>2011-09-16 09:00:57 -0700
commitc3b07057fd7f02b4e6bb006bcecff8683237778e (patch)
tree21b5d85193451c13ddd3004cc69441cb39773967 /ofproto
parentf613a0d72c521ca3a4eeb2c29ac523f6fdf72667 (diff)
downloadopenvswitch-c3b07057fd7f02b4e6bb006bcecff8683237778e.tar.gz
ofproto-dpif: Fix behavior when a subset of VLANs is trunked.
Reported-by: Philippe Jung <phil.jung@free.fr>
Diffstat (limited to 'ofproto')
-rw-r--r--ofproto/ofproto-dpif.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 98bcc7470..bd976f760 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);