diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-08-24 15:27:14 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-09-16 09:13:47 -0700 |
| commit | f6321a4042d444046c77a5667e13c630ff969c4f (patch) | |
| tree | 7fe36b7e721e6a6e75e212e71302c1f38b80f5b9 | |
| parent | 45a1c58bdb929f771db666f0aed525e64e7f5bb0 (diff) | |
| download | openvswitch-f6321a4042d444046c77a5667e13c630ff969c4f.tar.gz | |
ofproto-dpif: Fix behavior when a subset of VLANs is trunked.
Reported-by: Philippe Jung <phil.jung@free.fr>
| -rw-r--r-- | 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 5ebf05772..2d0b83c60 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -1061,7 +1061,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); |