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
Merge branch 'master' into forward-port
[sliver-openvswitch.git]
/
vswitchd
/
bridge.c
diff --git
a/vswitchd/bridge.c
b/vswitchd/bridge.c
index
1fbbe32
..
53bb7b9
100644
(file)
--- a/
vswitchd/bridge.c
+++ b/
vswitchd/bridge.c
@@
-885,7
+885,7
@@
port_configure_stp(const struct ofproto *ofproto, struct port *port,
const char *config_str;
struct iface *iface;
const char *config_str;
struct iface *iface;
- if (
smap_get_bool(&port->cfg->other_config, "stp-enable", fals
e)) {
+ if (
!smap_get_bool(&port->cfg->other_config, "stp-enable", tru
e)) {
port_s->enable = false;
return;
} else {
port_s->enable = false;
return;
} else {
@@
-2525,7
+2525,12
@@
bridge_add_del_ports(struct bridge *br,
if (iface) {
iface->cfg = cfg;
iface->type = type;
if (iface) {
iface->cfg = cfg;
iface->type = type;
- } else if (strcmp(type, "null")) {
+ } else if (!strcmp(type, "null")) {
+ VLOG_WARN_ONCE("%s: The null interface type is deprecated and"
+ " may be removed in February 2013. Please email"
+ " dev@openvswitch.org with concerns.",
+ cfg->name);
+ } else {
bridge_queue_if_cfg(br, cfg, port);
}
}
bridge_queue_if_cfg(br, cfg, port);
}
}