Merge remote-tracking branch 'remotes/kraxel/tags/pull-fixes-20170403-1' into staging

[mirror_qemu.git] / slirp / dhcpv6.c

diff --git a/slirp/dhcpv6.c b/slirp/dhcpv6.c
index 02c51c77567a6f1af7b66aec34d9efc9fd5c0958..d266611e85c794bacc61358d3d7df236d2c291a7 100644 (file)
--- a/slirp/dhcpv6.c
+++ b/slirp/dhcpv6.c
@@ -168,7 +168,7 @@ static void dhcpv6_info_request(Slirp *slirp, struct sockaddr_in6 *srcsas,
                         sa[0], sa[1], sa[2], sa[3], sa[4], sa[5], sa[6], sa[7],
                         sa[8], sa[9], sa[10], sa[11], sa[12], sa[13], sa[14],
                         sa[15], slirp->bootp_filename);
-        slen = min(slen, smaxlen);
+        slen = MIN(slen, smaxlen);
         *resp++ = slen >> 8;                    /* option-len high byte */
         *resp++ = slen;                         /* option-len low byte */
         resp += slen;