From f6321a4042d444046c77a5667e13c630ff969c4f Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 24 Aug 2011 15:27:14 -0700 Subject: [PATCH] ofproto-dpif: Fix behavior when a subset of VLANs is trunked. Reported-by: Philippe Jung --- ofproto/ofproto-dpif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.47.0