X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fofproto.c;h=e571bd4e2314d2113213ca83c769c7bb16e27334;hb=998bb652ecb494af8aa38ed0ae4e653cd8dff709;hp=adc52827c8846d5aa6142896930809c9407b03ba;hpb=d295e8e97acae13552a5b220d3fbcff8201064a2;p=openvswitch diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index adc52827..e571bd4e 100644 --- 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; - int 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) { - struct ofconn *ofconn; 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. */ - 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);