diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-15 10:39:29 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-15 10:39:29 +0000 |
| commit | fd06527b80c88c8dde1b35fdc692685b68d2fd93 (patch) | |
| tree | 7e1b1f6e8835a8585fbc3bb929fb563248324598 /slirp/udp6.c | |
| parent | c7947342d7dda87eeeb4a04b6e467f81385014ce (diff) | |
| parent | 318116a6ff36bee13c725a247a9395e80bcfbd6b (diff) | |
| download | focaccia-qemu-fd06527b80c88c8dde1b35fdc692685b68d2fd93.tar.gz focaccia-qemu-fd06527b80c88c8dde1b35fdc692685b68d2fd93.zip | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates # gpg: Signature made Sun 14 Jan 2018 17:19:24 GMT # gpg: using RSA key 0x996849C1CF560478 # gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" # gpg: aka "Samuel Thibault <sthibault@debian.org>" # gpg: aka "Samuel Thibault <samuel.thibault@gnu.org>" # gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>" # gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>" # gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" # gpg: aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6 # Subkey fingerprint: 3A3A 5D46 4660 E867 610C A427 9968 49C1 CF56 0478 * remotes/thibault/tags/samuel-thibault: slirp: add in6_dhcp_multicast() slirp: removed unused code slirp: remove unnecessary struct declaration slirp: remove unused header slirp: avoid IN6_IS_ADDR_UNSPECIFIED(), rather use in6_zero() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp/udp6.c')
| -rw-r--r-- | slirp/udp6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/slirp/udp6.c b/slirp/udp6.c index 9fa314bc2d..7c4a6b003a 100644 --- a/slirp/udp6.c +++ b/slirp/udp6.c @@ -65,7 +65,7 @@ void udp6_input(struct mbuf *m) /* handle DHCPv6 */ if (ntohs(uh->uh_dport) == DHCPV6_SERVER_PORT && (in6_equal(&ip->ip_dst, &slirp->vhost_addr6) || - in6_equal(&ip->ip_dst, &(struct in6_addr)ALLDHCP_MULTICAST))) { + in6_dhcp_multicast(&ip->ip_dst))) { m->m_data += iphlen; m->m_len -= iphlen; dhcpv6_input(&lhost, m); |