whitespace cleanup

10 files changed, 67 insertions, 67 deletions

diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 686364a29aa..9da8bc43e75 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp6.c,v 1.60 2002/06/08 21:22:02 itojun Exp $	*/
+/*	$OpenBSD: icmp6.c,v 1.61 2002/06/09 14:38:39 itojun Exp $	*/
 /*	$KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $	*/
 
 /*
@@ -976,7 +976,7 @@ icmp6_notify_error(m, off, icmp6len, code)
 					return(-1);
 				}
 #endif
-				
+
 				if (nxt == IPPROTO_AH)
 					eoff += (eh->ip6e_len + 2) << 2;
 				else
@@ -1230,7 +1230,7 @@ icmp6_mtudisc_update(ip6cp, validated)
 /*
  * Process a Node Information Query packet, based on
  * draft-ietf-ipngwg-icmp-name-lookups-07.
- * 
+ *
  * Spec incompatibilities:
  * - IPv6 Subject address handling
  * - IPv4 Subject address handling support missing
@@ -1923,7 +1923,7 @@ ni6_store_addrs(ni6, nni6, ifp0, resid)
 				else
 					ltime = 0;
 			}
-			
+
 			bcopy(&ltime, cp, sizeof(u_int32_t));
 			cp += sizeof(u_int32_t);
 
@@ -1934,7 +1934,7 @@ ni6_store_addrs(ni6, nni6, ifp0, resid)
 			if (IN6_IS_ADDR_LINKLOCAL(&ifa6->ia_addr.sin6_addr))
 				((struct in6_addr *)cp)->s6_addr16[1] = 0;
 			cp += sizeof(struct in6_addr);
-			
+
 			resid -= (sizeof(struct in6_addr) + sizeof(u_int32_t));
 			copied += (sizeof(struct in6_addr) +
 				   sizeof(u_int32_t));
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index dbc992fbce5..33f19d8ece6 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6.c,v 1.43 2002/06/08 21:51:08 itojun Exp $	*/
+/*	$OpenBSD: in6.c,v 1.44 2002/06/09 14:38:39 itojun Exp $	*/
 /*	$KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $	*/
 
 /*
@@ -147,14 +147,14 @@ in6_ifloop_request(int cmd, struct ifaddr *ifa)
 	struct sockaddr_in6 all1_sa;
 	struct rtentry *nrt = NULL;
 	int e;
-	
+
 	bzero(&lo_sa, sizeof(lo_sa));
 	bzero(&all1_sa, sizeof(all1_sa));
 	lo_sa.sin6_family = all1_sa.sin6_family = AF_INET6;
 	lo_sa.sin6_len = all1_sa.sin6_len = sizeof(struct sockaddr_in6);
 	lo_sa.sin6_addr = in6addr_loopback;
 	all1_sa.sin6_addr = in6mask128;
-	
+
 	/*
 	 * We specify the address itself as the gateway, and set the
 	 * RTF_LLINFO flag, so that the corresponding host route would have
@@ -338,7 +338,7 @@ in6_mask2len(mask, lim0)
 			if (*p != 0)
 				return(-1);
 	}
-	
+
 	return x * 8 + y;
 }
 
@@ -597,7 +597,7 @@ in6_control(so, cmd, data, ifp, p)
 			 */
 			maxexpire = (-1) &
 			    ~(1 << ((sizeof(maxexpire) * 8) - 1));
-			if (ia->ia6_lifetime.ia6t_vltime < 
+			if (ia->ia6_lifetime.ia6t_vltime <
 			    maxexpire - ia->ia6_updatetime) {
 				retlt->ia6t_expire = ia->ia6_updatetime +
 				    ia->ia6_lifetime.ia6t_vltime;
@@ -615,7 +615,7 @@ in6_control(so, cmd, data, ifp, p)
 			 */
 			maxexpire = (-1) &
 			    ~(1 << ((sizeof(maxexpire) * 8) - 1));
-			if (ia->ia6_lifetime.ia6t_pltime < 
+			if (ia->ia6_lifetime.ia6t_pltime <
 			    maxexpire - ia->ia6_updatetime) {
 				retlt->ia6t_preferred = ia->ia6_updatetime +
 				    ia->ia6_lifetime.ia6t_pltime;
@@ -892,7 +892,7 @@ in6_update_ifa(ifp, ifra, ia)
 			 * prefixmask as if the prefix length was 128.
 			 */
 			ifra->ifra_prefixmask.sin6_len =
-			    sizeof(struct sockaddr_in6); 
+			    sizeof(struct sockaddr_in6);
 			for (i = 0; i < 4; i++)
 				ifra->ifra_prefixmask.sin6_addr.s6_addr32[i] =
 				    0xffffffff;
@@ -987,7 +987,7 @@ in6_update_ifa(ifp, ifra, ia)
 	/*
 	 * If a new destination address is specified, scrub the old one and
 	 * install the new destination.  Note that the interface must be
-	 * p2p or loopback (see the check above.) 
+	 * p2p or loopback (see the check above.)
 	 */
 	if (dst6.sin6_family == AF_INET6 &&
 	    !IN6_ARE_ADDR_EQUAL(&dst6.sin6_addr, &ia->ia_dstaddr.sin6_addr)) {
@@ -1037,7 +1037,7 @@ in6_update_ifa(ifp, ifra, ia)
 
 	/*
 	 * Beyond this point, we should call in6_purgeaddr upon an error,
-	 * not just go to unlink. 
+	 * not just go to unlink.
 	 */
 
 	if ((ifp->if_flags & IFF_MULTICAST) != 0) {
@@ -1067,7 +1067,7 @@ in6_update_ifa(ifp, ifra, ia)
 			} else {
 				log(LOG_ERR, "in6_update_ifa: addmulti "
 				    "failed for %s on %s (errno=%d)\n",
-				    ip6_sprintf(&llsol.sin6_addr), 
+				    ip6_sprintf(&llsol.sin6_addr),
 				    ifp->if_xname, error);
 				goto cleanup;
 			}
@@ -1136,7 +1136,7 @@ in6_update_ifa(ifp, ifra, ia)
 			log(LOG_WARNING,
 			    "in6_update_ifa: addmulti failed for "
 			    "%s on %s (errno=%d)\n",
-			    ip6_sprintf(&mltaddr.sin6_addr), 
+			    ip6_sprintf(&mltaddr.sin6_addr),
 			    ifp->if_xname, error);
 			goto cleanup;
 		}
@@ -1152,7 +1152,7 @@ in6_update_ifa(ifp, ifra, ia)
 			} else {
 				log(LOG_WARNING, "in6_update_ifa: "
 				    "addmulti failed for %s on %s (errno=%d)\n",
-				    ip6_sprintf(&mltaddr.sin6_addr), 
+				    ip6_sprintf(&mltaddr.sin6_addr),
 				    ifp->if_xname, error);
 				/* XXX not very fatal, go on... */
 			}
@@ -1202,7 +1202,7 @@ in6_update_ifa(ifp, ifra, ia)
 				log(LOG_WARNING, "in6_update_ifa: "
 				    "addmulti failed for %s on %s "
 				    "(errno=%d)\n",
-				    ip6_sprintf(&mltaddr.sin6_addr), 
+				    ip6_sprintf(&mltaddr.sin6_addr),
 				    ifp->if_xname, error);
 				goto cleanup;
 			}
@@ -2115,7 +2115,7 @@ in6_addr2scopeid(ifp, addr)
 	struct in6_addr *addr;	/* must not be NULL */
 {
 	int scope = in6_addrscope(addr);
-		
+
 	switch(scope) {
 	case IPV6_ADDR_SCOPE_NODELOCAL:
 		return(-1);	/* XXX: is this an appropriate value? */
@@ -2240,7 +2240,7 @@ in6_ifawithscope(oifp, dst)
 	struct ifaddr *ifa;
 	struct ifnet *ifp;
 	struct in6_ifaddr *ifa_best = NULL;
-	
+
 	if (oifp == NULL) {
 		printf("in6_ifawithscope: output interface is not specified\n");
 		return(NULL);
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index ce8714aa930..3f556e54f2e 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_proto.c,v 1.36 2002/06/07 21:47:44 itojun Exp $	*/
+/*	$OpenBSD: in6_proto.c,v 1.37 2002/06/09 14:38:39 itojun Exp $	*/
 /*	$KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $	*/
 
 /*
@@ -149,35 +149,35 @@ struct ip6protosw inet6sw[] = {
 },
 { SOCK_RAW,	&inet6domain,	IPPROTO_DSTOPTS,PR_ATOMIC|PR_ADDR,
   dest6_input,	0,	 	0,		0,
-  0,	  
+  0,
   0,		0,		0,		0,
 },
 { SOCK_RAW,	&inet6domain,	IPPROTO_ROUTING,PR_ATOMIC|PR_ADDR,
   route6_input,	0,	 	0,		0,
-  0,	  
+  0,
   0,		0,		0,		0,
 },
 { SOCK_RAW,	&inet6domain,	IPPROTO_FRAGMENT,PR_ATOMIC|PR_ADDR,
   frag6_input,	0,	 	0,		0,
-  0,	  
+  0,
   0,		0,		0,		0,
 },
 #ifdef IPSEC
 { SOCK_RAW,	&inet6domain,	IPPROTO_AH,	PR_ATOMIC|PR_ADDR,
   ah6_input,	0,	 	0,		0,
-  0,	  
+  0,
   0,		0,		0,		0,
   ah_sysctl,
 },
 { SOCK_RAW,	&inet6domain,	IPPROTO_ESP,	PR_ATOMIC|PR_ADDR,
   esp6_input,	0,	 	0,		0,
-  0,	  
+  0,
   0,		0,		0,		0,
   esp_sysctl,
 },
 { SOCK_RAW,	&inet6domain,	IPPROTO_IPCOMP,	PR_ATOMIC|PR_ADDR,
   ipcomp6_input, 0,	 	0,		0,
-  0,	  
+  0,
   0,		0,		0,		0,
   ipcomp_sysctl,
 },
@@ -210,7 +210,7 @@ struct ip6protosw inet6sw[] = {
 #endif /* INET */
 #endif /* GIF */
 { SOCK_RAW,	&inet6domain,	IPPROTO_PIM,	PR_ATOMIC|PR_ADDR,
-  pim6_input,	rip6_output,	0,		rip6_ctloutput, 
+  pim6_input,	rip6_output,	0,		rip6_ctloutput,
   rip6_usrreq,
   0,		0,		0,		0,
 },
@@ -223,7 +223,7 @@ struct ip6protosw inet6sw[] = {
 };
 
 struct domain inet6domain =
-    { AF_INET6, "internet6", 0, 0, 0, 
+    { AF_INET6, "internet6", 0, 0, 0,
       (struct protosw *)inet6sw,
       (struct protosw *)&inet6sw[sizeof(inet6sw)/sizeof(inet6sw[0])], 0,
       rn_inithead,
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index cc0bcdaff5e..a758b5c5515 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_forward.c,v 1.23 2002/06/08 21:22:03 itojun Exp $	*/
+/*	$OpenBSD: ip6_forward.c,v 1.24 2002/06/09 14:38:39 itojun Exp $	*/
 /*	$KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $	*/
 
 /*
@@ -403,7 +403,7 @@ ip6_forward(m, srcrt)
 		}
 		m_freem(m);
 		return;
- 	}
+	}
 
 	if (rt->rt_flags & RTF_GATEWAY)
 		dst = (struct sockaddr_in6 *)rt->rt_gateway;
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 5c8362b2e8e..48b550ae8dc 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_mroute.c,v 1.25 2002/06/08 21:51:08 itojun Exp $	*/
+/*	$OpenBSD: ip6_mroute.c,v 1.26 2002/06/09 14:38:39 itojun Exp $	*/
 /*	$KAME: ip6_mroute.c,v 1.45 2001/03/25 08:38:51 itojun Exp $	*/
 
 /*
@@ -1805,7 +1805,7 @@ pim6_input(mp, offp, proto)
 		}
 #endif
 
- 		rc = looutput(mif6table[reg_mif_num].m6_ifp, m,
+		rc = looutput(mif6table[reg_mif_num].m6_ifp, m,
 			      (struct sockaddr *) &dst,
 			      (struct rtentry *) NULL);
 	
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 69a189c7d2b..ba86e73354e 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_output.c,v 1.68 2002/06/08 21:52:07 itojun Exp $	*/
+/*	$OpenBSD: ip6_output.c,v 1.69 2002/06/09 14:38:39 itojun Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 
 /*
@@ -786,7 +786,7 @@ ip6_output(m0, opt, ro, flags, im6o, ifpp)
 		m->m_pkthdr.rcvif = NULL;
 	}
 
-#if NPF > 0 
+#if NPF > 0
 	if (pf_test6(PF_OUT, ifp, &m) != PF_PASS) {
 		error = EHOSTUNREACH;
 		m_freem(m);
@@ -795,7 +795,7 @@ ip6_output(m0, opt, ro, flags, im6o, ifpp)
 	if (m == NULL)
 		goto done;
 	ip6 = mtod(m, struct ip6_hdr *);
-#endif 
+#endif
 
 	/*
 	 * Send the packet to the outgoing interface.
@@ -1367,12 +1367,12 @@ do { \
 				}
 				optval = *mtod(m, int *);
 
-				if (optval < IPSEC_LEVEL_BYPASS || 
+				if (optval < IPSEC_LEVEL_BYPASS ||
 				    optval > IPSEC_LEVEL_UNIQUE) {
 					error = EINVAL;
 					break;
 				}
-					
+
 				switch (optname) {
 				case IPV6_AUTH_LEVEL:
 				        if (optval < ipsec_auth_default_level &&
@@ -1619,7 +1619,7 @@ ip6_raw_ctloutput(op, so, level, optname, mp)
 			(void)m_free(*mp);
 		return(EINVAL);
 	}
-		
+
 	switch (optname) {
 	case IPV6_CHECKSUM:
 		/*
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index f0c47edf91c..8dab7ae1917 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mld6.c,v 1.15 2002/06/08 21:51:08 itojun Exp $	*/
+/*	$OpenBSD: mld6.c,v 1.16 2002/06/09 14:38:39 itojun Exp $	*/
 /*	$KAME: mld6.c,v 1.26 2001/02/16 14:50:35 itojun Exp $	*/
 
 /*
@@ -265,7 +265,7 @@ mld6_input(m, off)
 			timer = 1;
 		mld6_all_nodes_linklocal.s6_addr16[1] =
 			htons(ifp->if_index); /* XXX */
-		
+
 		for (in6m = ia->ia6_multiaddrs.lh_first;
 		     in6m;
 		     in6m = in6m->in6m_entry.le_next)
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index dc15eb4a729..805cc6fc143 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6_nbr.c,v 1.26 2002/06/08 21:51:08 itojun Exp $	*/
+/*	$OpenBSD: nd6_nbr.c,v 1.27 2002/06/09 14:38:39 itojun Exp $	*/
 /*	$KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $	*/
 
 /*
@@ -157,7 +157,7 @@ nd6_ns_input(m, off, icmp6len)
 		lladdr = (char *)(ndopts.nd_opts_src_lladdr + 1);
 		lladdrlen = ndopts.nd_opts_src_lladdr->nd_opt_len << 3;
 	}
-	
+
 	if (IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_src) && lladdr) {
 		nd6log((LOG_INFO, "nd6_ns_input: bad DAD packet "
 		    "(link-layer address option)\n"));
@@ -199,7 +199,7 @@ nd6_ns_input(m, off, icmp6len)
 		struct rtentry *rt;
 		struct sockaddr_in6 tsin6;
 
-		bzero(&tsin6, sizeof tsin6);		
+		bzero(&tsin6, sizeof tsin6);
 		tsin6.sin6_len = sizeof(struct sockaddr_in6);
 		tsin6.sin6_family = AF_INET6;
 		tsin6.sin6_addr = taddr6;
@@ -337,7 +337,7 @@ nd6_ns_output(ifp, daddr6, taddr6, ln, dad)
 	struct route_in6 ro;
 
 	bzero(&ro, sizeof(ro));
-	
+
 	if (IN6_IS_ADDR_MULTICAST(taddr6))
 		return;
 
@@ -483,7 +483,7 @@ nd6_ns_output(ifp, daddr6, taddr6, ln, dad)
 		struct nd_opt_hdr *nd_opt = (struct nd_opt_hdr *)(nd_ns + 1);
 		/* 8 byte alignments... */
 		optlen = (optlen + 7) & ~7;
-		
+
 		m->m_pkthdr.len += optlen;
 		m->m_len += optlen;
 		icmp6len += optlen;
@@ -946,7 +946,7 @@ nd6_na_output(ifp, daddr6, taddr6, flags, tlladdr, sdl0)
 	if (tlladdr && mac) {
 		int optlen = sizeof(struct nd_opt_hdr) + ifp->if_addrlen;
 		struct nd_opt_hdr *nd_opt = (struct nd_opt_hdr *)(nd_na + 1);
-		
+
 		/* roundup to 8 bytes alignment! */
 		optlen = (optlen + 7) & ~7;
 
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index 88ae16c9414..a8d3734b946 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6_rtr.c,v 1.20 2002/06/09 00:59:29 itojun Exp $	*/
+/*	$OpenBSD: nd6_rtr.c,v 1.21 2002/06/09 14:38:39 itojun Exp $	*/
 /*	$KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $	*/
 
 /*
@@ -204,7 +204,7 @@ nd6_ra_input(m, off, icmp6len)
 	/*
 	 * We only accept RAs only when
 	 * the system-wide variable allows the acceptance, and
-	 * per-interface variable allows RAs on the receiving interface.  
+	 * per-interface variable allows RAs on the receiving interface.
 	 */
 	if (ip6_accept_rtadv == 0)
 		goto freeit;
@@ -384,14 +384,14 @@ nd6_ra_input(m, off, icmp6len)
 	}
 
  skip:
-	
+
 	/*
 	 * Source link layer address
 	 */
     {
 	char *lladdr = NULL;
 	int lladdrlen = 0;
-	
+
 	if (ndopts.nd_opts_src_lladdr) {
 		lladdr = (char *)(ndopts.nd_opts_src_lladdr + 1);
 		lladdrlen = ndopts.nd_opts_src_lladdr->nd_opt_len << 3;
@@ -693,7 +693,7 @@ defrouter_reset()
 	defrouter_delifreq();
 
 	/*
-	 * XXX should we also nuke any default routers in the kernel, by 
+	 * XXX should we also nuke any default routers in the kernel, by
 	 * going through them by rtalloc1()?
 	 */
 }
@@ -818,7 +818,7 @@ defrouter_select()
 		if (!installed_dr || !TAILQ_NEXT(installed_dr, dr_entry))
 			selected_dr = TAILQ_FIRST(&nd_defrouter);
 		else
- 			selected_dr = TAILQ_NEXT(installed_dr, dr_entry);
+			selected_dr = TAILQ_NEXT(installed_dr, dr_entry);
 	} else if (installed_dr &&
 	    (rt = nd6_lookup(&installed_dr->rtaddr, 0, installed_dr->ifp)) &&
 	    (ln = (struct llinfo_nd6 *)rt->rt_llinfo) &&
@@ -842,9 +842,9 @@ defrouter_select()
 	return;
 }
 
-/* 
+/*
  * for default router selection
- * regards router-preference field as a 2-bit signed integer 
+ * regards router-preference field as a 2-bit signed integer
  */
 static int
 rtpref(struct nd_defrouter *dr)
@@ -893,7 +893,7 @@ defrtrlist_update(new)
 			dr->rtlifetime = new->rtlifetime;
 			dr->expire = new->expire;
 
-			/* 
+			/*
 			 * If the preference does not change, there's no need
 			 * to sort the entries.
 			 */
@@ -955,7 +955,7 @@ insert:
 	defrouter_select();
 
 	splx(s);
-		
+
 	return(n);
 }
 
@@ -965,7 +965,7 @@ pfxrtr_lookup(pr, dr)
 	struct nd_defrouter *dr;
 {
 	struct nd_pfxrouter *search;
-	
+
 	for (search = pr->ndpr_advrtrs.lh_first; search; search = search->pfr_next) {
 		if (search->router == dr)
 			break;
@@ -1235,7 +1235,7 @@ prelist_update(new, dr, m)
 	 * This should have been done in nd6_ra_input.
 	 */
 
- 	/*
+	/*
 	 * 5.5.3 (d). If the prefix advertised does not match the prefix of an
 	 * address already in the list, and the Valid Lifetime is not 0,
 	 * form an address.  Note that even a manually configured address
@@ -1260,7 +1260,7 @@ prelist_update(new, dr, m)
 		 */
 		if ((ifa6->ia6_flags & IN6_IFF_ANYCAST) != 0)
 			continue;
-		
+
 		ifa_plen = in6_mask2len(&ifa6->ia_prefixmask.sin6_addr, NULL);
 		if (ifa_plen != new->ndpr_plen ||
 		    !in6_are_prefix_equal(&ifa6->ia_addr.sin6_addr,
@@ -1594,7 +1594,7 @@ nd6_prefix_onlink(pr)
 	}
 
 	/*
-	 * We prefer link-local addresses as the associated interface address. 
+	 * We prefer link-local addresses as the associated interface address.
 	 */
 	/* search for a link-local addr */
 	ifa = (struct ifaddr *)in6ifa_ifpforlinklocal(ifp,
@@ -1784,7 +1784,7 @@ in6_ifadd(pr)
 	 * (2) RFC2462 5.4 suggesting the use of the same interface identifier
 	 * for multiple addresses on a single interface, and possible shortcut
 	 * of DAD.  we omitted DAD for this reason in the past.
-	 * (3) a user can prevent autoconfiguration of global address 
+	 * (3) a user can prevent autoconfiguration of global address
 	 * by removing link-local address by hand (this is partly because we
 	 * don't have other way to control the use of IPv6 on a interface.
 	 * this has been our design choice - cf. NRL's "ifconfig auto").
@@ -1842,7 +1842,7 @@ in6_ifadd(pr)
 	    (ib->ia_addr.sin6_addr.s6_addr32[2] & ~mask.s6_addr32[2]);
 	ifra.ifra_addr.sin6_addr.s6_addr32[3] |=
 	    (ib->ia_addr.sin6_addr.s6_addr32[3] & ~mask.s6_addr32[3]);
-	    
+
 	/* new prefix mask. */
 	ifra.ifra_prefixmask.sin6_len = sizeof(struct sockaddr_in6);
 	ifra.ifra_prefixmask.sin6_family = AF_INET6;
@@ -1852,7 +1852,7 @@ in6_ifadd(pr)
 	/*
 	 * lifetime.
 	 * XXX: in6_init_address_ltimes would override these values later.
-	 * We should reconsider this logic. 
+	 * We should reconsider this logic.
 	 */
 	ifra.ifra_lifetime.ia6t_vltime = pr->ndpr_vltime;
 	ifra.ifra_lifetime.ia6t_pltime = pr->ndpr_pltime;
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 164f196ad77..d24f5115f52 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raw_ip6.c,v 1.13 2002/06/08 21:51:08 itojun Exp $	*/
+/*	$OpenBSD: raw_ip6.c,v 1.14 2002/06/09 14:38:39 itojun Exp $	*/
 /*	$KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $	*/
 
 /*
@@ -490,7 +490,7 @@ rip6_output(struct mbuf *m, ...)
 	if (in6p->in6p_flags & IN6P_MINMTU)
 		flags |= IPV6_MINMTU;
 #endif
-	
+
 	error = ip6_output(m, optp, &in6p->in6p_route, flags,
 	    in6p->in6p_moptions, &oifp);
 	if (so->so_proto->pr_protocol == IPPROTO_ICMPV6) {
@@ -611,7 +611,7 @@ rip6_usrreq(so, req, m, nam, control, p)
 		in6p = sotoin6pcb(so);
 		in6p->in6p_ip6.ip6_nxt = (long)nam;
 		in6p->in6p_cksum = -1;
-		
+
 		MALLOC(in6p->in6p_icmp6filt, struct icmp6_filter *,
 		    sizeof(struct icmp6_filter), M_PCB, M_NOWAIT);
 		if (in6p->in6p_icmp6filt == NULL) {