diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-12-12 14:44:23 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-12-12 14:45:01 -0800 |
| commit | 4cf7aabac84e724929f9ab4031f0ea07a2cd0f1c (patch) | |
| tree | e4ba7c16336250c0f83032e4473172f8088ef79e /vswitchd | |
| parent | 3f49deabb35d98f573581fcb1c8c0c3c3b9bbb03 (diff) | |
bridge: Enable support for access and native VLAN ports on bonds.
Since Open vSwitch's inception we've disabled the use of bonds as access
ports, for no particularly good reason. This also unintentionally
prevented bonds from being used as native VLAN ports.
This commit removes the code that prevented using bonds these ways
Reported-and-tested-by: "Michael A. Collins" <mike.a.collins@ark-net.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'vswitchd')
| -rw-r--r-- | vswitchd/bridge.c | 13 |
1 files changed, 2 insertions, 11 deletions
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. */ |