From: Ben Pfaff <blp@nicira.com>
Date: Mon, 15 Apr 2013 22:55:56 +0000 (-0700)
Subject: netdev-vport: Make netdev_vport_get_dpif_port() code less confusing.
X-Git-Tag: sliver-openvswitch-1.10.90-3~6^2~143
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b1612a86b5cebc7f13f10fd5f5b084fcc4b80e49;p=sliver-openvswitch.git

netdev-vport: Make netdev_vport_get_dpif_port() code less confusing.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index c0d8a3c6f..bdb0c4da3 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 *