From owner-cvs-all@FreeBSD.ORG Wed Sep 7 10:11:50 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8EE2316A41F; Wed, 7 Sep 2005 10:11:50 +0000 (GMT) (envelope-from obrien@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5EE8743D45; Wed, 7 Sep 2005 10:11:50 +0000 (GMT) (envelope-from obrien@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j87ABoIx012710; Wed, 7 Sep 2005 10:11:50 GMT (envelope-from obrien@repoman.freebsd.org) Received: (from obrien@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j87ABoLm012709; Wed, 7 Sep 2005 10:11:50 GMT (envelope-from obrien) Message-Id: <200509071011.j87ABoLm012709@repoman.freebsd.org> From: "David E. O'Brien" Date: Wed, 7 Sep 2005 10:11:49 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/netinet6 in6.c in6_pcb.c in6_var.h ip6_mroute.c ip6_output.c mld6.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Sep 2005 10:11:50 -0000 obrien 2005-09-07 10:11:49 UTC FreeBSD src repository Modified files: sys/netinet6 in6.c in6_pcb.c in6_var.h ip6_mroute.c ip6_output.c mld6.c Log: 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. Revision Changes Path 1.54 +4 -4 src/sys/netinet6/in6.c 1.64 +1 -1 src/sys/netinet6/in6_pcb.c 1.25 +1 -1 src/sys/netinet6/in6_var.h 1.33 +19 -19 src/sys/netinet6/ip6_mroute.c 1.98 +8 -8 src/sys/netinet6/ip6_output.c 1.23 +2 -2 src/sys/netinet6/mld6.c