From 65a0903b26bdff3e42dc0fa78ef5b73a48448e80 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Wed, 9 Apr 2014 17:19:17 +0200 Subject: [PATCH] bridge: improve vlan mode related error messages when adding port Inform about fallback to trunk mode and convert errors to warnings when we are not failing. Signed-off-by: Thomas Graf Signed-off-by: Ben Pfaff --- vswitchd/bridge.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 24b3602c7..f46d002eb 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -839,15 +839,16 @@ port_configure(struct port *port) s.vlan_mode = PORT_VLAN_NATIVE_UNTAGGED; } else { /* This "can't happen" because ovsdb-server should prevent it. */ - VLOG_ERR("unknown VLAN mode %s", cfg->vlan_mode); + VLOG_WARN("port %s: unknown VLAN mode %s, falling " + "back to trunk mode", port->name, cfg->vlan_mode); s.vlan_mode = PORT_VLAN_TRUNK; } } else { if (s.vlan >= 0) { s.vlan_mode = PORT_VLAN_ACCESS; if (cfg->n_trunks) { - VLOG_ERR("port %s: ignoring trunks in favor of implicit vlan", - port->name); + VLOG_WARN("port %s: ignoring trunks in favor of implicit vlan", + port->name); } } else { s.vlan_mode = PORT_VLAN_TRUNK; -- 2.43.0