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 commit 'origin/citrix'
[sliver-openvswitch.git]
/
vswitchd
/
bridge.c
diff --git
a/vswitchd/bridge.c
b/vswitchd/bridge.c
index
f977c2b
..
cd4fde3
100644
(file)
--- a/
vswitchd/bridge.c
+++ b/
vswitchd/bridge.c
@@
-793,9
+793,12
@@
bridge_unixctl_fdb_show(struct unixctl_conn *conn, const char *args)
if (br->ml) {
const struct mac_entry *e;
LIST_FOR_EACH (e, struct mac_entry, lru_node, &br->ml->lrus) {
if (br->ml) {
const struct mac_entry *e;
LIST_FOR_EACH (e, struct mac_entry, lru_node, &br->ml->lrus) {
+ if (e->port < 0 || e->port >= br->n_ports) {
+ continue;
+ }
ds_put_format(&ds, "%5d %4d "ETH_ADDR_FMT" %3d\n",
ds_put_format(&ds, "%5d %4d "ETH_ADDR_FMT" %3d\n",
-
e->port, e->vlan, ETH_ADDR_ARGS(e->mac)
,
- mac_entry_age(e));
+
br->ports[e->port]->ifaces[0]->dp_ifidx
,
+
e->vlan, ETH_ADDR_ARGS(e->mac),
mac_entry_age(e));
}
}
unixctl_command_reply(conn, 200, ds_cstr(&ds));
}
}
unixctl_command_reply(conn, 200, ds_cstr(&ds));