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 "master" into "next".
[sliver-openvswitch.git]
/
lib
/
dhcp.c
diff --git
a/lib/dhcp.c
b/lib/dhcp.c
index
51d6ed0
..
e16176b
100644
(file)
--- a/
lib/dhcp.c
+++ b/
lib/dhcp.c
@@
-674,7
+674,7
@@
dhcp_parse(struct dhcp_msg *msg, const struct ofpbuf *b_)
msg->giaddr = dhcp->giaddr;
memcpy(msg->chaddr, dhcp->chaddr, ETH_ADDR_LEN);
- cookie = ofpbuf_try_pull(&b, sizeof cookie);
+ cookie = ofpbuf_try_pull(&b, sizeof
*
cookie);
if (cookie) {
if (ntohl(*cookie) == DHCP_OPTS_COOKIE) {
uint8_t overload;