mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +00:00
Code Issues Releases Wiki Activity

dpif: Update dpif interface to match netdev.

Browse Source 
This brings over some features that were added to the netdev interface,
most notably the separation between the name and the type.  In addition
to being cleaner, this also avoids problems where it is expected that
the local port has the same name as the datapath.
This commit is contained in:
Jesse Gross
2010-01-22 14:37:10 -05:00
parent e328faadc4
commit 1a6f1e2a6d
15 changed files with 273 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/dpif-linux.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2009 Nicira Networks.
* Copyright (c) 2008, 2009, 2010 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@ dpif_linux_enumerate(struct svec *all_dps)
int retval;
sprintf(devname, "dp%d", i);
retval = dpif_open(devname, &dpif);
retval = dpif_open(devname, "system", &dpif);
if (!retval) {
svec_add(all_dps, devname);
dpif_close(dpif);
@@ -107,7 +107,7 @@ dpif_linux_enumerate(struct svec *all_dps)
}
static int
dpif_linux_open(const char *name UNUSED, char *suffix, bool create,
dpif_linux_open(const char *name, const char *type UNUSED, bool create,
struct dpif **dpifp)
{
int minor;
@@ -116,11 +116,11 @@ dpif_linux_open(const char *name UNUSED, char *suffix, bool create,
&& isdigit((unsigned char)name[2]) ? atoi(name + 2) : -1;
if (create) {
if (minor >= 0) {
return create_minor(suffix, minor, dpifp);
return create_minor(name, minor, dpifp);
} else {
/* Scan for unused minor number. */
for (minor = 0; minor < ODP_MAX; minor++) {
int error = create_minor(suffix, minor, dpifp);
int error = create_minor(name, minor, dpifp);
if (error != EBUSY) {
return error;
}
@@ -135,7 +135,7 @@ dpif_linux_open(const char *name UNUSED, char *suffix, bool create,
int error;
if (minor < 0) {
error = lookup_minor(suffix, &minor);
error = lookup_minor(name, &minor);
if (error) {
return error;
}
@@ -446,8 +446,7 @@ dpif_linux_recv_wait(struct dpif *dpif_)
}
const struct dpif_class dpif_linux_class = {
"", /* This is the default class. */
"linux",
"system",
NULL,
NULL,
dpif_linux_enumerate,