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
use zu/zd in printf to avoid warnings on 32bit
[sliver-openvswitch.git]
/
ovsdb
/
jsonrpc-server.c
diff --git
a/ovsdb/jsonrpc-server.c
b/ovsdb/jsonrpc-server.c
index
1149efd
..
1d0b0e3
100644
(file)
--- a/
ovsdb/jsonrpc-server.c
+++ b/
ovsdb/jsonrpc-server.c
@@
-17,7
+17,6
@@
#include "jsonrpc-server.h"
#include "jsonrpc-server.h"
-#include <assert.h>
#include <errno.h>
#include "bitmap.h"
#include <errno.h>
#include "bitmap.h"
@@
-532,7
+531,7
@@
ovsdb_jsonrpc_session_set_all_options(
remote->dscp = options->dscp;
}
/*
remote->dscp = options->dscp;
}
/*
- *
TODO:
XXX race window between setting dscp to listening socket
+ * XXX race window between setting dscp to listening socket
* and accepting socket. Accepted socket may have old dscp value.
* Ignore this race window for now.
*/
* and accepting socket. Accepted socket may have old dscp value.
* Ignore this race window for now.
*/
@@
-1292,7
+1291,7
@@
ovsdb_jsonrpc_monitor_remove_all(struct ovsdb_jsonrpc_session *s)
static struct ovsdb_jsonrpc_monitor *
ovsdb_jsonrpc_monitor_cast(struct ovsdb_replica *replica)
{
static struct ovsdb_jsonrpc_monitor *
ovsdb_jsonrpc_monitor_cast(struct ovsdb_replica *replica)
{
- assert(replica->class == &ovsdb_jsonrpc_replica_class);
+
ovs_
assert(replica->class == &ovsdb_jsonrpc_replica_class);
return CONTAINER_OF(replica, struct ovsdb_jsonrpc_monitor, replica);
}
return CONTAINER_OF(replica, struct ovsdb_jsonrpc_monitor, replica);
}