projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debian: Fix references to OpenFlow in ovs-switch-config template
[openvswitch]
/
lib
/
dpif-linux.c
diff --git
a/lib/dpif-linux.c
b/lib/dpif-linux.c
index b7ba3062e86da1f1902c9595d2f2269b645f96b3..1eaba744903b9357b5b7cb15b0f7933568554ca3 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 OVS_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;
}
@@
-188,7
+188,7
@@
dpif_linux_get_all_names(const struct dpif *dpif_, struct svec *all_names)
}
static int
}
static int
-dpif_linux_de
lete
(struct dpif *dpif_)
+dpif_linux_de
stroy
(struct dpif *dpif_)
{
return do_ioctl(dpif_, ODP_DP_DESTROY, NULL);
}
{
return do_ioctl(dpif_, ODP_DP_DESTROY, NULL);
}
@@
-460,15
+460,14
@@
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,
dpif_linux_open,
dpif_linux_close,
dpif_linux_get_all_names,
NULL,
NULL,
dpif_linux_enumerate,
dpif_linux_open,
dpif_linux_close,
dpif_linux_get_all_names,
- dpif_linux_de
lete
,
+ dpif_linux_de
stroy
,
dpif_linux_get_stats,
dpif_linux_get_drop_frags,
dpif_linux_set_drop_frags,
dpif_linux_get_stats,
dpif_linux_get_drop_frags,
dpif_linux_set_drop_frags,
@@
-571,13
+570,14
@@
make_openvswitch_device(int minor, char **fnp)
struct stat s;
char fn[128];
struct stat s;
char fn[128];
+ *fnp = NULL;
+
major = get_openvswitch_major();
if (major < 0) {
return -major;
}
dev = makedev(major, minor);
major = get_openvswitch_major();
if (major < 0) {
return -major;
}
dev = makedev(major, minor);
- *fnp = NULL;
sprintf(fn, "%s/dp%d", dirname, minor);
if (!stat(fn, &s)) {
if (!S_ISCHR(s.st_mode)) {
sprintf(fn, "%s/dp%d", dirname, minor);
if (!stat(fn, &s)) {
if (!S_ISCHR(s.st_mode)) {
@@
-677,6
+677,8
@@
get_major(const char *target)
}
}
}
}
+ fclose(file);
+
VLOG_ERR("%s: %s major not found (is the module loaded?)", fn, target);
return -ENODEV;
}
VLOG_ERR("%s: %s major not found (is the module loaded?)", fn, target);
return -ENODEV;
}
@@
-685,11
+687,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;
@@
-706,7
+708,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;