diff options
| author | Justin Pettit <jpettit@nicira.com> | 2012-11-13 17:57:11 -0800 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2012-11-16 12:35:55 -0800 |
| commit | 29c743b672eeaca8bad2c4ef86088730a95accd0 (patch) | |
| tree | b7e594d10996ba46a12acb49eb110eaeb0fe54fc /lib/dpif-netdev.c | |
| parent | 310f36993face9b809430d27dac37f65a691b537 (diff) | |
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>
Diffstat (limited to 'lib/dpif-netdev.c')
| -rw-r--r-- | 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 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; |