--- src/sys/netinet6/ip6_mroute.c	2008/06/05 18:06:32	1.17
+++ src/sys/netinet6/ip6_mroute.c	2008/06/21 12:30:19	1.18
@@ -234,8 +234,7 @@ ip6_mrouter_set(struct socket *so, struc
 
 	if ((error = soopt_getm(sopt, &m)) != 0) /* XXX */
 		return (error);
-	if ((error = soopt_mcopyin(sopt, m)) != 0) /* XXX */
-		return (error);
+	soopt_to_mbuf(sopt, m);	/* XXX */
 
 	switch (sopt->sopt_name) {
 	case MRT6_INIT:
@@ -283,7 +282,7 @@ ip6_mrouter_get(struct socket *so, struc
 
 	switch (sopt->sopt_name) {
 		case MRT6_PIM:
-			error = sooptcopyout(sopt, &pim6, sizeof(pim6));
+			soopt_from_kbuf(sopt, &pim6, sizeof(pim6));
 			break;
 	}
 	return (error);