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 'mainstream'
[sliver-openvswitch.git]
/
lib
/
dpif.c
diff --git
a/lib/dpif.c
b/lib/dpif.c
index
9577e4f
..
69d9c34
100644
(file)
--- a/
lib/dpif.c
+++ b/
lib/dpif.c
@@
-17,7
+17,6
@@
#include <config.h>
#include "dpif-provider.h"
#include <config.h>
#include "dpif-provider.h"
-#include <assert.h>
#include <ctype.h>
#include <errno.h>
#include <inttypes.h>
#include <ctype.h>
#include <errno.h>
#include <inttypes.h>
@@
-62,6
+61,7
@@
static const struct dpif_class *base_dpif_classes[] = {
&dpif_linux_class,
#endif
&dpif_netdev_class,
&dpif_linux_class,
#endif
&dpif_netdev_class,
+ &dpif_planetlab_class,
};
struct registered_dpif_class {
};
struct registered_dpif_class {
@@
-265,7
+265,7
@@
do_open(const char *name, const char *type, bool create, struct dpif **dpifp)
error = registered_class->dpif_class->open(registered_class->dpif_class,
name, create, &dpif);
if (!error) {
error = registered_class->dpif_class->open(registered_class->dpif_class,
name, create, &dpif);
if (!error) {
- assert(dpif->dpif_class == registered_class->dpif_class);
+
ovs_
assert(dpif->dpif_class == registered_class->dpif_class);
registered_class->refcount++;
}
registered_class->refcount++;
}
@@
-329,8
+329,8
@@
dpif_close(struct dpif *dpif)
registered_class = shash_find_data(&dpif_classes,
dpif->dpif_class->type);
registered_class = shash_find_data(&dpif_classes,
dpif->dpif_class->type);
- assert(registered_class);
- assert(registered_class->refcount);
+
ovs_
assert(registered_class);
+
ovs_
assert(registered_class->refcount);
registered_class->refcount--;
dpif_uninit(dpif, true);
registered_class->refcount--;
dpif_uninit(dpif, true);
@@
-516,7
+516,7
@@
bool
dpif_port_exists(const struct dpif *dpif, const char *devname)
{
int error = dpif->dpif_class->port_query_by_name(dpif, devname, NULL);
dpif_port_exists(const struct dpif *dpif, const char *devname)
{
int error = dpif->dpif_class->port_query_by_name(dpif, devname, NULL);
- if (error != 0 && error != ENODEV) {
+ if (error != 0 && error != ENO
ENT && error != ENO
DEV) {
VLOG_WARN_RL(&error_rl, "%s: failed to query port %s: %s",
dpif_name(dpif), devname, strerror(error));
}
VLOG_WARN_RL(&error_rl, "%s: failed to query port %s: %s",
dpif_name(dpif), devname, strerror(error));
}
@@
-614,7
+614,7
@@
dpif_port_get_name(struct dpif *dpif, uint32_t port_no,
struct dpif_port port;
int error;
struct dpif_port port;
int error;
- assert(name_size > 0);
+
ovs_
assert(name_size > 0);
error = dpif_port_query_by_number(dpif, port_no, &port);
if (!error) {
error = dpif_port_query_by_number(dpif, port_no, &port);
if (!error) {
@@
-821,8
+821,8
@@
dpif_flow_put__(struct dpif *dpif, const struct dpif_flow_put *put)
int error;
COVERAGE_INC(dpif_flow_put);
int error;
COVERAGE_INC(dpif_flow_put);
- assert(!(put->flags & ~(DPIF_FP_CREATE | DPIF_FP_MODIFY
- | DPIF_FP_ZERO_STATS)));
+
ovs_
assert(!(put->flags & ~(DPIF_FP_CREATE | DPIF_FP_MODIFY
+
| DPIF_FP_ZERO_STATS)));
error = dpif->dpif_class->flow_put(dpif, put);
if (error && put->stats) {
error = dpif->dpif_class->flow_put(dpif, put);
if (error && put->stats) {