projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mirroring: Preserve key for disabling learning.
[openvswitch]
/
vswitchd
/
ovs-brcompatd.c
diff --git
a/vswitchd/ovs-brcompatd.c
b/vswitchd/ovs-brcompatd.c
index 02ebab8c8d029d6a150901aeb6c9afaca1959d06..13bb843dd624e5834fae8648414ab7a135f5520a 100644
(file)
--- a/
vswitchd/ovs-brcompatd.c
+++ b/
vswitchd/ovs-brcompatd.c
@@
-525,7
+525,7
@@
del_port(const char *br_name, const char *port_name)
{
cfg_del_entry("bridge.%s.port=%s", br_name, port_name);
cfg_del_match("bonding.*.slave=%s", port_name);
{
cfg_del_entry("bridge.%s.port=%s", br_name, port_name);
cfg_del_match("bonding.*.slave=%s", port_name);
- cfg_del_match("vlan.%s.*", port_name);
+ cfg_del_match("vlan.%s.
[!0-9]
*", port_name);
}
static int
}
static int
@@
-865,6
+865,8
@@
handle_get_ports_cmd(struct ofpbuf *buffer)
svec_init(&ports);
get_bridge_ports(ovs_bridge, &ports, br_vlan);
svec_init(&ports);
get_bridge_ports(ovs_bridge, &ports, br_vlan);
+ svec_sort(&ports);
+ svec_del(&ports, linux_bridge);
send_ifindex_reply(seq, &ports); /* XXX bonds won't show up */
svec_destroy(&ports);
send_ifindex_reply(seq, &ports); /* XXX bonds won't show up */
svec_destroy(&ports);