diff options
| author | obrien <obrien@FreeBSD.org> | 2005-09-07 10:11:49 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2005-09-07 10:11:49 +0000 |
| commit | c532dfe7456f7cfd69cc1875646ebbafd781ae5c (patch) | |
| tree | a65b15f9016e79eeea392bd977253f6b4fb46d5e /sys/netinet6/mld6.c | |
| parent | b888392910bbf46a7bf35f9715822cfd277e96a9 (diff) | |
| download | FreeBSD-src-c532dfe7456f7cfd69cc1875646ebbafd781ae5c.zip FreeBSD-src-c532dfe7456f7cfd69cc1875646ebbafd781ae5c.tar.gz | |
IPv6 was improperly defining its malloc type the same as IPv4 (M_IPMADDR,
M_IPMOPTS, M_MRTABLE). Thus we had conflicting instantiations.
Create an IPv6-specific type to overcome this.
Diffstat (limited to 'sys/netinet6/mld6.c')
| -rw-r--r-- | sys/netinet6/mld6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index 35236da..f5194b7 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -530,7 +530,7 @@ in6_addmulti(maddr6, ifp, errorp) /* XXX - if_addmulti uses M_WAITOK. Can this really be called at interrupt time? If so, need to fix if_addmulti. XXX */ - in6m = (struct in6_multi *)malloc(sizeof(*in6m), M_IPMADDR, M_NOWAIT); + in6m = (struct in6_multi *)malloc(sizeof(*in6m), M_IP6MADDR, M_NOWAIT); if (in6m == NULL) { splx(s); return (NULL); @@ -571,7 +571,7 @@ in6_delmulti(in6m) mld6_stop_listening(in6m); ifma->ifma_protospec = NULL; LIST_REMOVE(in6m, in6m_entry); - free(in6m, M_IPMADDR); + free(in6m, M_IP6MADDR); } /* XXX - should be separate API for when we have an ifma? */ if_delmulti(ifma->ifma_ifp, ifma->ifma_addr); |
