diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | vswitchd/bridge.c | 13 |
2 files changed, 3 insertions, 11 deletions
@@ -89,6 +89,7 @@ John Galgay john@galgay.net Koichi Yagishita yagishita.koichi@jrc.co.jp Krishna Miriyala krishna@nicira.com Luiz Henrique Ozaki luiz.ozaki@gmail.com +Michael A. Collins mike.a.collins@ark-net.org Michael Hu mhu@nicira.com Michael Mao mmao@nicira.com Murphy McCauley murphy.mccauley@gmail.com diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index adf01f7f..de773f61 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -539,17 +539,8 @@ port_configure(struct port *port) /* Get VLAN tag. */ s.vlan = -1; - if (cfg->tag) { - if (list_is_short(&port->ifaces)) { - if (*cfg->tag >= 0 && *cfg->tag <= 4095) { - s.vlan = *cfg->tag; - } - } else { - /* It's possible that bonded, VLAN-tagged ports make sense. Maybe - * they even work as-is. But they have not been tested. */ - VLOG_WARN("port %s: VLAN tags not supported on bonded ports", - port->name); - } + if (cfg->tag && *cfg->tag >= 0 && *cfg->tag <= 4095) { + s.vlan = *cfg->tag; } /* Get VLAN trunks. */ |