--- src/sys/netinet6/in6.c	2006/12/22 23:57:53	1.24
+++ src/sys/netinet6/in6.c	2007/08/16 20:03:58	1.25
@@ -231,7 +231,7 @@ done:
  * rely on the cloning mechanism from the corresponding interface route
  * any more.
  */
-static void
+void
 in6_ifaddloop(struct ifaddr *ifa)
 {
 	struct rtentry *rt;
@@ -249,7 +249,7 @@ in6_ifaddloop(struct ifaddr *ifa)
  * Remove loopback rtentry of ownaddr generated by in6_ifaddloop(),
  * if it exists.
  */
-static void
+void
 in6_ifremloop(struct ifaddr *ifa)
 {
 	struct in6_ifaddr *ia;
@@ -1614,6 +1614,39 @@ in6_ifinit(struct ifnet *ifp, struct in6
 	return (error);
 }
 
+struct in6_multi_mship *
+in6_joingroup(ifp, addr, errorp)
+       struct ifnet *ifp;
+       struct in6_addr *addr;
+       int *errorp;
+{
+       struct in6_multi_mship *imm;
+
+       imm = kmalloc(sizeof(*imm), M_IPMADDR, M_NOWAIT);
+       if (!imm) {
+               *errorp = ENOBUFS;
+               return NULL;
+       }
+       imm->i6mm_maddr = in6_addmulti(addr, ifp, errorp);
+       if (!imm->i6mm_maddr) {
+               /* *errorp is alrady set */
+               kfree(imm, M_IPMADDR);
+               return NULL;
+       }
+       return imm;
+}
+
+int
+in6_leavegroup(imm)
+       struct in6_multi_mship *imm;
+{
+
+       if (imm->i6mm_maddr)
+               in6_delmulti(imm->i6mm_maddr);
+       kfree(imm,  M_IPMADDR);
+       return 0;
+}
+
 /*
  * Add an address to the list of IP6 multicast addresses for a
  * given interface.