From: Justin Pettit <jpettit@nicira.com>
Date: Wed, 14 Nov 2012 01:57:11 +0000 (-0800)
Subject: dpif-netdev: Don't special-case "br" bridges in create_dp_netdev().
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29c743b672eeaca8bad2c4ef86088730a95accd0;p=openvswitch

dpif-netdev: Don't special-case "br" bridges in create_dp_netdev().

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

Signed-off-by: Justin Pettit <jpettit@nicira.com>
---

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index 4ce4147c..a294ffc8 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;