[ovs-dev] [cleanups 01/12] dpif-netdev: Don't special-case "br" bridges in create_dp_netdev().

Justin Pettit jpettit at nicira.com
Fri Nov 16 08:02:54 UTC 2012


With a single datapath, we no longer need to special case bridges
beginning with "br*" for testing, since all bridges are netdev-based
bridges are named "ovs-netdev".  This removes that unnecessary code.

Signed-off-by: Justin Pettit <jpettit at nicira.com>
---
 lib/dpif-netdev.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index 4ce4147..a294ffc 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -241,7 +241,6 @@ create_dp_netdev(const char *name, const struct dpif_class *class,
                  struct dp_netdev **dpp)
 {
     struct dp_netdev *dp;
-    int port_no;
     int error;
     int i;
 
@@ -255,8 +254,7 @@ create_dp_netdev(const char *name, const struct dpif_class *class,
     hmap_init(&dp->flow_table);
     list_init(&dp->port_list);
 
-    port_no = !strncmp(name, "br", 2) ? choose_port(dp, name) : OVSP_LOCAL;
-    error = do_add_port(dp, name, "internal", port_no);
+    error = do_add_port(dp, name, "internal", OVSP_LOCAL);
     if (error) {
         dp_netdev_free(dp);
         return error;
-- 
1.7.5.4




More information about the dev mailing list