git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into next
[sliver-openvswitch.git]
/
lib
/
dpif-linux.c
diff --git
a/lib/dpif-linux.c
b/lib/dpif-linux.c
index
e7d4381
..
d707b46
100644
(file)
--- a/
lib/dpif-linux.c
+++ b/
lib/dpif-linux.c
@@
-95,10
+95,10
@@
dpif_linux_enumerate(struct svec *all_dps)
int retval;
sprintf(devname, "dp%d", i);
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);
if (!retval) {
svec_add(all_dps, devname);
- dpif_
close(dpif
);
+ dpif_
uninit(dpif, true
);
} else if (retval != ENODEV && !error) {
error = retval;
}
} else if (retval != ENODEV && !error) {
error = retval;
}
@@
-107,7
+107,7
@@
dpif_linux_enumerate(struct svec *all_dps)
}
static int
}
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;
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) {
&& 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++) {
} 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;
}
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) {
int error;
if (minor < 0) {
- error = lookup_minor(
suffix
, &minor);
+ error = lookup_minor(
name
, &minor);
if (error) {
return error;
}
if (error) {
return error;
}
@@
-157,7
+157,7
@@
dpif_linux_open(const char *name UNUSED, char *suffix, bool create,
VLOG_WARN("%s: probe returned unexpected error: %s",
dpif_name(*dpifp), strerror(error));
}
VLOG_WARN("%s: probe returned unexpected error: %s",
dpif_name(*dpifp), strerror(error));
}
- dpif_
close(*dpifp
);
+ dpif_
uninit(*dpifp, true
);
return error;
}
return error;
}
@@
-460,8
+460,7
@@
dpif_linux_recv_wait(struct dpif *dpif_)
}
const struct dpif_class dpif_linux_class = {
}
const struct dpif_class dpif_linux_class = {
- "", /* This is the default class. */
- "linux",
+ "system",
NULL,
NULL,
dpif_linux_enumerate,
NULL,
NULL,
dpif_linux_enumerate,
@@
-686,11
+685,11
@@
static int
finish_open(struct dpif *dpif_, const char *local_ifname)
{
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
finish_open(struct dpif *dpif_, const char *local_ifname)
{
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
- dpif->local_ifname = strdup(local_ifname);
+ dpif->local_ifname =
x
strdup(local_ifname);
dpif->local_ifindex = if_nametoindex(local_ifname);
if (!dpif->local_ifindex) {
int error = errno;
dpif->local_ifindex = if_nametoindex(local_ifname);
if (!dpif->local_ifindex) {
int error = errno;
- dpif_
close(dpif_
);
+ dpif_
uninit(dpif_, true
);
VLOG_WARN("could not get ifindex of %s device: %s",
local_ifname, strerror(errno));
return error;
VLOG_WARN("could not get ifindex of %s device: %s",
local_ifname, strerror(errno));
return error;
@@
-707,7
+706,7
@@
create_minor(const char *name, int minor, struct dpif **dpifp)
if (!error) {
error = finish_open(*dpifp, name);
} else {
if (!error) {
error = finish_open(*dpifp, name);
} else {
- dpif_
close(*dpifp
);
+ dpif_
uninit(*dpifp, true
);
}
}
return error;
}
}
return error;