Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet6/mld6.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/mld6.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.39
retrieving revision 1.44.2.1
diff -u -p -r1.39 -r1.44.2.1
--- src/sys/netinet6/mld6.c	2007/07/09 21:11:13	1.39
+++ src/sys/netinet6/mld6.c	2008/05/18 12:35:35	1.44.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: mld6.c,v 1.39 2007/07/09 21:11:13 ad Exp $	*/
+/*	$NetBSD: mld6.c,v 1.44.2.1 2008/05/18 12:35:35 yamt Exp $	*/
 /*	$KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $	*/
 
 /*
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.39 2007/07/09 21:11:13 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.44.2.1 2008/05/18 12:35:35 yamt Exp $");
 
 #include "opt_inet.h"
 
@@ -110,6 +110,7 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.3
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
+#include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
@@ -125,6 +126,7 @@ __KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.3
 #include <netinet6/ip6_var.h>
 #include <netinet6/scope6_var.h>
 #include <netinet/icmp6.h>
+#include <netinet6/icmp6_private.h>
 #include <netinet6/mld6_var.h>
 
 #include <net/net_osdep.h>
@@ -163,11 +165,10 @@ static struct mld_hdr * mld_allocbuf(str
 static void mld_sendpkt(struct in6_multi *, int, const struct in6_addr *);
 static void mld_starttimer(struct in6_multi *);
 static void mld_stoptimer(struct in6_multi *);
-static void mld_timeo(struct in6_multi *);
 static u_long mld_timerresid(struct in6_multi *);
 
 void
-mld_init()
+mld_init(void)
 {
 	static u_int8_t hbh_buf[8];
 	struct ip6_hbh *hbh = (struct ip6_hbh *)hbh_buf;
@@ -203,8 +204,7 @@ mld_starttimer(struct in6_multi *in6m)
 	}
 
 	/* start or restart the timer */
-	callout_reset(in6m->in6m_timer_ch, in6m->in6m_timer,
-	    (void (*) __P((void *)))mld_timeo, in6m);
+	callout_schedule(&in6m->in6m_timer_ch, in6m->in6m_timer);
 }
 
 static void
@@ -213,19 +213,20 @@ mld_stoptimer(struct in6_multi *in6m)
 	if (in6m->in6m_timer == IN6M_TIMER_UNDEF)
 		return;
 
-	callout_stop(in6m->in6m_timer_ch);
+	callout_stop(&in6m->in6m_timer_ch);
 
 	in6m->in6m_timer = IN6M_TIMER_UNDEF;
 }
 
 static void
-mld_timeo(struct in6_multi *in6m)
+mld_timeo(void *arg)
 {
-	int s = splsoftnet();
+	struct in6_multi *in6m = arg;
 
-	in6m->in6m_timer = IN6M_TIMER_UNDEF;
+	mutex_enter(softnet_lock);
+	KERNEL_LOCK(1, NULL);
 
-	callout_stop(in6m->in6m_timer_ch);
+	in6m->in6m_timer = IN6M_TIMER_UNDEF;
 
 	switch (in6m->in6m_state) {
 	case MLD_REPORTPENDING:
@@ -236,7 +237,8 @@ mld_timeo(struct in6_multi *in6m)
 		break;
 	}
 
-	splx(s);
+	KERNEL_UNLOCK_ONE(NULL);
+	mutex_exit(softnet_lock);
 }
 
 static u_long
@@ -332,7 +334,7 @@ mld_input(struct mbuf *m, int off)
 
 	IP6_EXTHDR_GET(mldh, struct mld_hdr *, m, off, sizeof(*mldh));
 	if (mldh == NULL) {
-		icmp6stat.icp6s_tooshort++;
+		ICMP6_STATINC(ICMP6_STAT_TOOSHORT);
 		return;
 	}
 
@@ -539,7 +541,7 @@ mld_sendpkt(struct in6_multi *in6m, int 
 	im6o.im6o_multicast_loop = (ip6_mrouter != NULL);
 
 	/* increment output statictics */
-	icmp6stat.icp6s_outhist[type]++;
+	ICMP6_STATINC(ICMP6_STAT_OUTHIST + type);
 	icmp6_ifstat_inc(ifp, ifs6_out_msg);
 	switch (type) {
 	case MLD_LISTENER_QUERY:
@@ -647,16 +649,8 @@ in6_addmulti(struct in6_addr *maddr6, st
 		in6m->in6m_ifp = ifp;
 		in6m->in6m_refcount = 1;
 		in6m->in6m_timer = IN6M_TIMER_UNDEF;
-		in6m->in6m_timer_ch =
-		    malloc(sizeof(*in6m->in6m_timer_ch), M_IPMADDR, M_NOWAIT);
-		if (in6m->in6m_timer_ch == NULL) {
-			free(in6m, M_IPMADDR);
-			splx(s);
-			return (NULL);
-		}
 		IFP_TO_IA6(ifp, ia);
 		if (ia == NULL) {
-			/* leaks in6m_timer_ch */
 			free(in6m, M_IPMADDR);
 			splx(s);
 			*errorp = EADDRNOTAVAIL; /* appropriate? */
@@ -670,10 +664,7 @@ in6_addmulti(struct in6_addr *maddr6, st
 		 * Ask the network driver to update its multicast reception
 		 * filter appropriately for the new address.
 		 */
-		memset(&ifr.ifr_addr, 0, sizeof(struct sockaddr_in6));
-		ifr.ifr_addr.sin6_family = AF_INET6;
-		ifr.ifr_addr.sin6_len = sizeof(struct sockaddr_in6);
-		ifr.ifr_addr.sin6_addr = *maddr6;
+		sockaddr_in6_init(&ifr.ifr_addr, maddr6, 0, 0, 0);
 		if (ifp->if_ioctl == NULL)
 			*errorp = ENXIO; /* XXX: appropriate? */
 		else
@@ -681,14 +672,14 @@ in6_addmulti(struct in6_addr *maddr6, st
 			    (void *)&ifr);
 		if (*errorp) {
 			LIST_REMOVE(in6m, in6m_entry);
-			/* leaks in6m_timer_ch */
 			free(in6m, M_IPMADDR);
 			IFAFREE(&ia->ia_ifa);
 			splx(s);
 			return (NULL);
 		}
 
-		callout_init(in6m->in6m_timer_ch, 0);
+		callout_init(&in6m->in6m_timer_ch, CALLOUT_MPSAFE);
+		callout_setfunc(&in6m->in6m_timer_ch, mld_timeo, in6m);
 		in6m->in6m_timer = timer;
 		if (in6m->in6m_timer > 0) {
 			in6m->in6m_state = MLD_REPORTPENDING;
@@ -752,13 +743,10 @@ in6_delmulti(struct in6_multi *in6m)
 		 * Notify the network driver to update its multicast
 		 * reception filter.
 		 */
-		memset(&ifr.ifr_addr, 0, sizeof(struct sockaddr_in6));
-		ifr.ifr_addr.sin6_family = AF_INET6;
-		ifr.ifr_addr.sin6_len = sizeof(struct sockaddr_in6);
-		ifr.ifr_addr.sin6_addr = in6m->in6m_addr;
+		sockaddr_in6_init(&ifr.ifr_addr, &in6m->in6m_addr, 0, 0, 0);
 		(*in6m->in6m_ifp->if_ioctl)(in6m->in6m_ifp,
 		    SIOCDELMULTI, (void *)&ifr);
-		free(in6m->in6m_timer_ch, M_IPMADDR);
+		callout_destroy(&in6m->in6m_timer_ch);
 		free(in6m, M_IPMADDR);
 	}
 	splx(s);