diff options
| author | Ben Pfaff <blp@nicira.com> | 2013-04-15 15:55:56 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2013-06-10 11:13:54 -0700 |
| commit | b1612a86b5cebc7f13f10fd5f5b084fcc4b80e49 (patch) | |
| tree | d6b1f7d189dd9fadd3650f998dc644fe6c80ba84 /lib/netdev-vport.c | |
| parent | 5014a89d9388d800ee5909acbb23705bb93ac1fc (diff) | |
netdev-vport: Make netdev_vport_get_dpif_port() code less confusing.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/netdev-vport.c')
| -rw-r--r-- | lib/netdev-vport.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index c0d8a3c6..bdb0c4da 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -124,8 +124,6 @@ const char * netdev_vport_get_dpif_port(const struct netdev *netdev, char namebuf[], size_t bufsize) { - const char *dpif_port; - if (netdev_vport_needs_dst_port(netdev)) { const struct netdev_vport *vport = netdev_vport_cast(netdev); const char *type = netdev_get_type(netdev); @@ -143,10 +141,9 @@ netdev_vport_get_dpif_port(const struct netdev *netdev, return namebuf; } else { const struct netdev_class *class = netdev_get_class(netdev); - dpif_port = netdev_vport_class_get_dpif_port(class); + const char *dpif_port = netdev_vport_class_get_dpif_port(class); + return dpif_port ? dpif_port : netdev_get_name(netdev); } - - return dpif_port ? dpif_port : netdev_get_name(netdev); } char * |