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 commit '559eb2308b4d616590aba34bb8f4dd7f12ae4587'
[sliver-openvswitch.git]
/
ofproto
/
pktbuf.c
diff --git
a/ofproto/pktbuf.c
b/ofproto/pktbuf.c
index
71be34a
..
902b19d
100644
(file)
--- a/
ofproto/pktbuf.c
+++ b/
ofproto/pktbuf.c
@@
-120,7
+120,7
@@
pktbuf_save(struct pktbuf *pb, const void *buffer, size_t buffer_size,
p->cookie = 0;
}
p->buffer = ofpbuf_clone_data_with_headroom(buffer, buffer_size,
p->cookie = 0;
}
p->buffer = ofpbuf_clone_data_with_headroom(buffer, buffer_size,
- sizeof(struct ofp_packet_in));
+ sizeof(struct ofp
10
_packet_in));
p->timeout = time_msec() + OVERWRITE_MSECS;
p->timeout = time_msec() + OVERWRITE_MSECS;
@@
-165,7
+165,7
@@
pktbuf_get_null(void)
*
* 'in_port' may be NULL if the input port is not of interest.
*
*
* 'in_port' may be NULL if the input port is not of interest.
*
- * A returned packet will have at least sizeof(struct ofp_packet_in) bytes of
+ * A returned packet will have at least sizeof(struct ofp
10
_packet_in) bytes of
* headroom.
*
* On failure, stores NULL in in '*bufferp' and UINT16_MAX in '*in_port'. */
* headroom.
*
* On failure, stores NULL in in '*bufferp' and UINT16_MAX in '*in_port'. */