Merge "master" into "next".

[openvswitch] / lib / dhcp.c

diff --git a/lib/dhcp.c b/lib/dhcp.c
index 51d6ed0708896158873bfb5bb785ed052e610cfd..e16176ba1bf32ee83059e6a6aa9e85df833e5aab 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;