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/in6.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/in6.c')
| -rw-r--r-- | sys/netinet6/in6.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index a5a7d04..fcf7aed 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -99,7 +99,7 @@ #include <net/net_osdep.h> -MALLOC_DEFINE(M_IPMADDR, "in6_multi", "internet multicast address"); +MALLOC_DEFINE(M_IP6MADDR, "in6_multi", "internet multicast address"); /* * Definitions of some costant IP6 addresses. @@ -1614,7 +1614,7 @@ in6_joingroup(ifp, addr, errorp) { struct in6_multi_mship *imm; - imm = malloc(sizeof(*imm), M_IPMADDR, M_NOWAIT); + imm = malloc(sizeof(*imm), M_IP6MADDR, M_NOWAIT); if (!imm) { *errorp = ENOBUFS; return NULL; @@ -1622,7 +1622,7 @@ in6_joingroup(ifp, addr, errorp) imm->i6mm_maddr = in6_addmulti(addr, ifp, errorp); if (!imm->i6mm_maddr) { /* *errorp is alrady set */ - free(imm, M_IPMADDR); + free(imm, M_IP6MADDR); return NULL; } return imm; @@ -1635,7 +1635,7 @@ in6_leavegroup(imm) if (imm->i6mm_maddr) in6_delmulti(imm->i6mm_maddr); - free(imm, M_IPMADDR); + free(imm, M_IP6MADDR); return 0; } |
