diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index e3d59791b2de..5a0fd45a6607 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,10 +1,10 @@
-/*	$NetBSD: in6_ifattach.c,v 1.23 2000/03/24 04:09:05 itojun Exp $	*/
+/*	$NetBSD: in6_ifattach.c,v 1.24 2000/04/10 15:45:24 itojun Exp $	*/
 /*	$KAME: in6_ifattach.c,v 1.39 2000/03/02 09:24:45 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +16,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -183,7 +183,7 @@ in6_ifattach_getifid(ifp0)
 			case IFT_ARCNET:
 				/*
 				 * ARCnet interface token cannot be used as
-				 * globally unique identifier due to its 
+				 * globally unique identifier due to its
 				 * small bitwidth.
 				 */
 				break;
@@ -319,7 +319,7 @@ in6_ifattach(ifp, type, laddr, noloop)
 
 	/*
 	 * To prevent to assign link-local address to PnP network
-	 * cards multiple times. 
+	 * cards multiple times.
 	 * This is lengthy for P2P and LOOP but works.
 	 */
 	ifa = TAILQ_FIRST(&ifp->if_addrlist);
@@ -446,12 +446,12 @@ in6_ifattach(ifp, type, laddr, noloop)
 
 			/* undo changes */
 			TAILQ_REMOVE(&ifp->if_addrlist, (struct ifaddr *)ia, ifa_list);
-			IFAFREE((struct ifaddr *)ia);
+			IFAFREE(&ia->ia_ifa);
 			if (oia)
 				oia->ia_next = ia->ia_next;
 			else
 				in6_ifaddr = ia->ia_next;
-			IFAFREE((struct ifaddr *)ia);
+			IFAFREE(&ia->ia_ifa);
 			return;
 		}
 	}
@@ -459,7 +459,7 @@ in6_ifattach(ifp, type, laddr, noloop)
 	/* add route to the interface. */
 	rtrequest(RTM_ADD,
 		  (struct sockaddr *)&ia->ia_addr,
-		  (struct sockaddr *)&ia->ia_addr, 
+		  (struct sockaddr *)&ia->ia_addr,
 		  (struct sockaddr *)&ia->ia_prefixmask,
 		  RTF_UP|rtflag,
 		  (struct rtentry **)0);
@@ -527,7 +527,7 @@ in6_ifattach(ifp, type, laddr, noloop)
 
 		rtrequest(RTM_ADD,
 			  (struct sockaddr *)&ib->ia_addr,
-			  (struct sockaddr *)&ib->ia_addr, 
+			  (struct sockaddr *)&ib->ia_addr,
 			  (struct sockaddr *)&ib->ia_prefixmask,
 			  RTF_UP|RTF_HOST,
 			  (struct rtentry **)0);
@@ -559,7 +559,7 @@ in6_ifattach(ifp, type, laddr, noloop)
 		mltaddr.sin6_addr.s6_addr16[1] = htons(ifp->if_index);
 		rtrequest(RTM_ADD,
 			  (struct sockaddr *)&mltaddr,
-			  (struct sockaddr *)&ia->ia_addr, 
+			  (struct sockaddr *)&ia->ia_addr,
 			  (struct sockaddr *)&mltmask,
 			  RTF_UP|RTF_CLONING,  /* xxx */
 			  (struct rtentry **)0);
@@ -572,7 +572,7 @@ in6_ifattach(ifp, type, laddr, noloop)
 			mltaddr.sin6_addr = in6addr_nodelocal_allnodes;
 			rtrequest(RTM_ADD,
 				  (struct sockaddr *)&mltaddr,
-				  (struct sockaddr *)&ib->ia_addr, 
+				  (struct sockaddr *)&ib->ia_addr,
 				  (struct sockaddr *)&mltmask,
 				  RTF_UP,
 				  (struct rtentry **)0);
@@ -668,7 +668,7 @@ in6_ifdetach(ifp)
 			rtfree(rt);
 			rtrequest(RTM_DELETE,
 				(struct sockaddr *)&ia->ia_addr,
-				(struct sockaddr *)&ia->ia_addr, 
+				(struct sockaddr *)&ia->ia_addr,
 				(struct sockaddr *)&ia->ia_prefixmask,
 				rtflags, (struct rtentry **)0);
 		}