diff options
| author | Ben Pfaff <blp@nicira.com> | 2013-06-06 15:27:15 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2013-06-06 15:29:59 -0700 |
| commit | ee46ebea0b06615f66f8db5f0cacf30a32aecabb (patch) | |
| tree | b1893fe22c0d199a404bb7758d1a3959b36168de /lib | |
| parent | 29d532d8b8d6475d370351572a2acd8e0e180edd (diff) | |
dpif-netdev: Don't run port names through netdev_vport_get_dpif_port().
The ports that exist within a dpif have already been translated through
netdev_vport_get_dpif_port(), so there is no value to translating them
again in the interfaces that query or dump ports (and possibly a drawback
if somehow the translation could change).
After this change, dpif-netdev translates port names in just one place,
the port_add path, which makes dpif-netdev act the same way as dpif-linux
in this respect.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dpif-netdev.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 054de1c4..c5e922b1 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -481,7 +481,7 @@ get_port_by_name(struct dp_netdev *dp, struct dp_netdev_port *port; LIST_FOR_EACH (port, node, &dp->port_list) { - if (!strcmp(netdev_vport_get_dpif_port(port->netdev), devname)) { + if (!strcmp(netdev_get_name(port->netdev), devname)) { *portp = port; return 0; } @@ -519,7 +519,7 @@ static void answer_port_query(const struct dp_netdev_port *port, struct dpif_port *dpif_port) { - dpif_port->name = xstrdup(netdev_vport_get_dpif_port(port->netdev)); + dpif_port->name = xstrdup(netdev_get_name(port->netdev)); dpif_port->type = xstrdup(port->type); dpif_port->port_no = port->port_no; } @@ -610,7 +610,7 @@ dpif_netdev_port_dump_next(const struct dpif *dpif, void *state_, struct dp_netdev_port *port = dp->ports[port_no]; if (port) { free(state->name); - state->name = xstrdup(netdev_vport_get_dpif_port(port->netdev)); + state->name = xstrdup(netdev_get_name(port->netdev)); dpif_port->name = state->name; dpif_port->type = port->type; dpif_port->port_no = port->port_no; @@ -1069,8 +1069,7 @@ dpif_netdev_run(struct dpif *dpif) } else if (error != EAGAIN && error != EOPNOTSUPP) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); VLOG_ERR_RL(&rl, "error receiving data from %s: %s", - netdev_vport_get_dpif_port(port->netdev), - strerror(error)); + netdev_get_name(port->netdev), strerror(error)); } } ofpbuf_uninit(&packet); |