64c64
< __FBSDID("$FreeBSD: head/sys/netinet6/in6.c 191340 2009-04-20 22:45:21Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/netinet6/in6.c 191672 2009-04-29 19:19:13Z bms $");
109,110d108
< MALLOC_DEFINE(M_IP6MADDR, "in6_multi", "internet multicast address");
<
121a120,121
> const struct in6_addr in6addr_linklocal_allv2routers =
> IN6ADDR_LINKLOCAL_ALLV2ROUTERS_INIT;
138d137
< struct in6_multihead in6_multihead; /* XXX BSS initialization */
1112a1112,1113
> * XXX: Break data hiding guidelines and look at
> * state for the solicited multicast group.
1116c1117
< in6m_sol->in6m_state == MLD_REPORTPENDING) {
---
> in6m_sol->in6m_state == MLD_REPORTING_MEMBER) {
1593,1622d1593
< struct in6_multi_mship *
< in6_joingroup(struct ifnet *ifp, struct in6_addr *addr,
< int *errorp, int delay)
< {
< struct in6_multi_mship *imm;
<
< imm = malloc(sizeof(*imm), M_IP6MADDR, M_NOWAIT);
< if (!imm) {
< *errorp = ENOBUFS;
< return NULL;
< }
< imm->i6mm_maddr = in6_addmulti(addr, ifp, errorp, delay);
< if (!imm->i6mm_maddr) {
< /* *errorp is alrady set */
< free(imm, M_IP6MADDR);
< return NULL;
< }
< return imm;
< }
<
< int
< in6_leavegroup(struct in6_multi_mship *imm)
< {
<
< if (imm->i6mm_maddr)
< in6_delmulti(imm->i6mm_maddr);
< free(imm, M_IP6MADDR);
< return 0;
< }
<
2330a2302,2304
>
> ext->mld_ifinfo = mld_domifattach(ifp);
>
2338a2313
> mld_domifdetach(ifp);