Mercurial > hg > dhcpcd
changeset 4487:6635eac6eb05 draft
Merge branch 'dhcpcd-7'
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Fri, 26 Apr 2019 14:20:24 +0100 |
| parents | 9ba7f650a8f7 (current diff) ecc12563d4ad (diff) |
| children | 6bf601e44f37 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ipv6nd.c Fri Apr 26 14:07:35 2019 +0100 +++ b/src/ipv6nd.c Fri Apr 26 14:20:24 2019 +0100 @@ -160,12 +160,6 @@ #define IPV6_RECVPKTINFO IPV6_PKTINFO #endif -#ifdef __sun -struct in6_addr all_nodes_mcast = { .s6_addr = { - 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } }; -#endif - /* Handy defines */ #define ipv6nd_free_ra(ra) ipv6nd_freedrop_ra((ra), 0) #define ipv6nd_drop_ra(ra) ipv6nd_freedrop_ra((ra), 1) @@ -238,7 +232,7 @@ { int s; struct ipv6_mreq mreq = { - .ipv6mr_multiaddr = all_nodes_mcast, + .ipv6mr_multiaddr = IN6ADDR_LINKLOCAL_ALLNODES_INIT, .ipv6mr_interface = ifp->index }; struct rs_state *state = RS_STATE(ifp);