git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto-dpif: Improve code clarity and comments on recirc changes to rule_dpif_lookup()
[sliver-openvswitch.git]
/
vswitchd
/
bridge.c
diff --git
a/vswitchd/bridge.c
b/vswitchd/bridge.c
index
80fdb54
..
f46d002
100644
(file)
--- 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. */
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) {
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;
}
} else {
s.vlan_mode = PORT_VLAN_TRUNK;
@@
-1446,8
+1447,7
@@
iface_do_create(const struct bridge *br,
VLOG_INFO("bridge %s: added interface %s on port %d",
br->name, iface_cfg->name, *ofp_portp);
VLOG_INFO("bridge %s: added interface %s on port %d",
br->name, iface_cfg->name, *ofp_portp);
- if ((port_cfg->vlan_mode && !strcmp(port_cfg->vlan_mode, "splinter"))
- || iface_is_internal(iface_cfg, br->cfg)) {
+ if (port_cfg->vlan_mode && !strcmp(port_cfg->vlan_mode, "splinter")) {
netdev_turn_flags_on(netdev, NETDEV_UP, NULL);
}
netdev_turn_flags_on(netdev, NETDEV_UP, NULL);
}