projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb-data: New function ovsdb_datum_from_shash().
[openvswitch]
/
ofproto
/
ofproto.c
diff --git
a/ofproto/ofproto.c
b/ofproto/ofproto.c
index adc52827c8846d5aa6142896930809c9407b03ba..e571bd4e2314d2113213ca83c769c7bb16e27334 100644
(file)
--- a/
ofproto/ofproto.c
+++ b/
ofproto/ofproto.c
@@
-1071,7
+1071,6
@@
ofproto_run1(struct ofproto *p)
for (i = 0; i < 50; i++) {
struct ofpbuf *buf;
for (i = 0; i < 50; i++) {
struct ofpbuf *buf;
- int error;
error = dpif_recv(p->dpif, &buf);
if (error) {
error = dpif_recv(p->dpif, &buf);
if (error) {
@@
-1122,7
+1121,6
@@
ofproto_run1(struct ofproto *p)
retval = pvconn_accept(ofservice->pvconn, OFP_VERSION, &vconn);
if (!retval) {
retval = pvconn_accept(ofservice->pvconn, OFP_VERSION, &vconn);
if (!retval) {
- struct ofconn *ofconn;
struct rconn *rconn;
char *name;
struct rconn *rconn;
char *name;
@@
-4154,7
+4152,8
@@
handle_odp_miss_msg(struct ofproto *p, struct ofpbuf *packet)
*
* See the top-level comment in fail-open.c for more information.
*/
*
* See the top-level comment in fail-open.c for more information.
*/
- send_packet_in(p, ofpbuf_clone(packet));
+ send_packet_in(p, ofpbuf_clone_with_headroom(packet,
+ DPIF_RECV_MSG_PADDING));
}
ofpbuf_pull(packet, sizeof *msg);
}
ofpbuf_pull(packet, sizeof *msg);