Remove trailing whitespace.

27 files changed, 117 insertions, 117 deletions

diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 4eb4412..c11a4cf 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -4,7 +4,7 @@
  *
  * This code is derived from the Stanford/CMU enet packet filter,
  * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence 
+ * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
  * Berkeley Laboratory.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
- * $Id: bpf.c,v 1.5 1995/03/14 09:14:10 davidg Exp $
+ * $Id: bpf.c,v 1.6 1995/05/09 13:35:38 davidg Exp $
  */
 
 #include "bpfilter.h"
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index 4714ffb..2da90b0 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -37,15 +37,15 @@
  *
  *      @(#)bpf.h	8.1 (Berkeley) 6/10/93
  *
- * $Id: bpf.h,v 1.2 1994/08/02 07:45:54 davidg Exp $
+ * $Id: bpf.h,v 1.3 1994/08/21 05:11:38 paul Exp $
  */
 
 #ifndef _NET_BPF_H_
 #define _NET_BPF_H_
 
 /*
- * Alignment macros.  BPF_WORDALIGN rounds up to the next 
- * even multiple of BPF_ALIGNMENT. 
+ * Alignment macros.  BPF_WORDALIGN rounds up to the next
+ * even multiple of BPF_ALIGNMENT.
  */
 #define BPF_ALIGNMENT sizeof(long)
 #define BPF_WORDALIGN(x) (((x)+(BPF_ALIGNMENT-1))&~(BPF_ALIGNMENT-1))
@@ -61,7 +61,7 @@ struct bpf_program {
 	u_int bf_len;
 	struct bpf_insn *bf_insns;
 };
- 
+
 /*
  * Struct returned by BIOCGSTATS.
  */
@@ -71,7 +71,7 @@ struct bpf_stat {
 };
 
 /*
- * Struct return by BIOCVERSION.  This represents the version number of 
+ * Struct return by BIOCVERSION.  This represents the version number of
  * the filter language described by the instruction encodings below.
  * bpf understands a program iff kernel_major == filter_major &&
  * kernel_minor >= filter_minor, that is, if the value returned by the
diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c
index b655dda2..076f255 100644
--- a/sys/net/bpf_filter.c
+++ b/sys/net/bpf_filter.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf_filter.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: bpf_filter.c,v 1.3 1994/08/02 07:45:58 davidg Exp $
+ * $Id: bpf_filter.c,v 1.4 1995/04/01 01:46:27 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -115,7 +115,7 @@ m_xword(m, k, err)
 		return (cp[0] << 24) | (np[0] << 16) | (np[1] << 8) | np[2];
 
 	case 2:
-		return (cp[0] << 24) | (cp[1] << 16) | (np[0] << 8) | 
+		return (cp[0] << 24) | (cp[1] << 16) | (np[0] << 8) |
 			np[1];
 
 	default:
@@ -193,7 +193,7 @@ bpf_filter(pc, p, wirelen, buflen)
 			return 0;
 #else
 			abort();
-#endif			
+#endif
 		case BPF_RET|BPF_K:
 			return (u_int)pc->k;
 
@@ -360,7 +360,7 @@ bpf_filter(pc, p, wirelen, buflen)
 		case BPF_LD|BPF_MEM:
 			A = mem[pc->k];
 			continue;
-			
+
 		case BPF_LDX|BPF_MEM:
 			X = mem[pc->k];
 			continue;
@@ -412,25 +412,25 @@ bpf_filter(pc, p, wirelen, buflen)
 		case BPF_ALU|BPF_ADD|BPF_X:
 			A += X;
 			continue;
-			
+
 		case BPF_ALU|BPF_SUB|BPF_X:
 			A -= X;
 			continue;
-			
+
 		case BPF_ALU|BPF_MUL|BPF_X:
 			A *= X;
 			continue;
-			
+
 		case BPF_ALU|BPF_DIV|BPF_X:
 			if (X == 0)
 				return 0;
 			A /= X;
 			continue;
-			
+
 		case BPF_ALU|BPF_AND|BPF_X:
 			A &= X;
 			continue;
-			
+
 		case BPF_ALU|BPF_OR|BPF_X:
 			A |= X;
 			continue;
@@ -446,23 +446,23 @@ bpf_filter(pc, p, wirelen, buflen)
 		case BPF_ALU|BPF_ADD|BPF_K:
 			A += pc->k;
 			continue;
-			
+
 		case BPF_ALU|BPF_SUB|BPF_K:
 			A -= pc->k;
 			continue;
-			
+
 		case BPF_ALU|BPF_MUL|BPF_K:
 			A *= pc->k;
 			continue;
-			
+
 		case BPF_ALU|BPF_DIV|BPF_K:
 			A /= pc->k;
 			continue;
-			
+
 		case BPF_ALU|BPF_AND|BPF_K:
 			A &= pc->k;
 			continue;
-			
+
 		case BPF_ALU|BPF_OR|BPF_K:
 			A |= pc->k;
 			continue;
@@ -494,9 +494,9 @@ bpf_filter(pc, p, wirelen, buflen)
 /*
  * Return true if the 'fcode' is a valid filter program.
  * The constraints are that each jump be forward and to a valid
- * code.  The code must terminate with either an accept or reject. 
+ * code.  The code must terminate with either an accept or reject.
  * 'valid' is an array for use by the routine (it must be at least
- * 'len' bytes long).  
+ * 'len' bytes long).
  *
  * The kernel needs to be able to verify an application's filter code.
  * Otherwise, a bogus program could easily crash the system.
@@ -511,7 +511,7 @@ bpf_validate(f, len)
 
 	for (i = 0; i < len; ++i) {
 		/*
-		 * Check that that jumps are forward, and within 
+		 * Check that that jumps are forward, and within
 		 * the code block.
 		 */
 		p = &f[i];
@@ -529,7 +529,7 @@ bpf_validate(f, len)
 		 * Check that memory operations use valid addresses.
 		 */
 		if ((BPF_CLASS(p->code) == BPF_ST ||
-		     (BPF_CLASS(p->code) == BPF_LD && 
+		     (BPF_CLASS(p->code) == BPF_LD &&
 		      (p->code & 0xe0) == BPF_MEM)) &&
 		    (p->k >= BPF_MEMWORDS || p->k < 0))
 			return 0;
diff --git a/sys/net/fddi.h b/sys/net/fddi.h
index a8efc5a..14ec343 100644
--- a/sys/net/fddi.h
+++ b/sys/net/fddi.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_fddi.h	8.1 (Berkeley) 6/10/93
- * $Id: if_fddi.h,v 1.1 1995/03/10 17:43:45 thomas Exp $
+ * $Id: if_fddi.h,v 1.1 1995/03/14 09:14:14 davidg Exp $
  */
 
 #ifndef _NETINET_IF_FDDI_H_
@@ -77,7 +77,7 @@ struct	fddi_header {
 void    fddi_ifattach __P((struct ifnet *));
 void    fddi_input __P((struct ifnet *, struct fddi_header *, struct mbuf *));
 int     fddi_output __P((struct ifnet *,
-           struct mbuf *, struct sockaddr *, struct rtentry *)); 
+           struct mbuf *, struct sockaddr *, struct rtentry *));
 
 #endif
 
diff --git a/sys/net/if.c b/sys/net/if.c
index 3756159..27d6149 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.3 (Berkeley) 1/4/94
- * $Id: if.c,v 1.13 1995/02/24 11:47:31 davidg Exp $
+ * $Id: if.c,v 1.14 1995/05/27 04:37:24 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -203,7 +203,7 @@ ifa_ifwithdstaddr(addr)
 	register struct ifnet *ifp;
 	register struct ifaddr *ifa;
 
-	for (ifp = ifnet; ifp; ifp = ifp->if_next) 
+	for (ifp = ifnet; ifp; ifp = ifp->if_next)
 	    if (ifp->if_flags & IFF_POINTOPOINT)
 		for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
 			if (ifa->ifa_addr->sa_family != addr->sa_family)
@@ -559,7 +559,7 @@ ifioctl(so, cmd, data, p)
 			return (error);
 		if (ifp->if_ioctl == NULL)
 			return (EOPNOTSUPP);
-		/* 
+		/*
 		 * 72 was chosen below because it is the size of a TCP/IP
 		 * header (40) + the minimum mss (32).
 		 */
@@ -659,7 +659,7 @@ ifconf(cmd, data)
 	for (; space > sizeof (ifr) && ifp; ifp = ifp->if_next) {
 		char workbuf[12], *unitname;
 		int unitlen, ifnlen;
-	       
+
 		unitname = sprint_d(ifp->if_unit, workbuf, sizeof workbuf);
 		unitlen = strlen(unitname);
 		ifnlen = strlen(ifp->if_name);
@@ -677,7 +677,7 @@ ifconf(cmd, data)
 			if (error)
 				break;
 			space -= sizeof (ifr), ifrp++;
-		} else 
+		} else
 		    for ( ; space > sizeof (ifr) && ifa; ifa = ifa->ifa_next) {
 			register struct sockaddr *sa = ifa->ifa_addr;
 #ifdef COMPAT_43
diff --git a/sys/net/if.h b/sys/net/if.h
index 987e5c4..9e898fb 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $Id: if.h,v 1.16 1995/03/16 18:14:24 bde Exp $
+ * $Id: if.h,v 1.17 1995/04/26 18:10:44 pst Exp $
  */
 
 #ifndef _NET_IF_H_
@@ -74,7 +74,7 @@
  */
 struct	mbuf;
 struct	proc;
-struct	rtentry;	
+struct	rtentry;
 struct	socket;
 struct	ether_header;
 #endif
@@ -133,7 +133,7 @@ struct ifnet {
 		__P((struct ifnet *));	/* (XXX not used; fake prototype) */
 	int	(*if_ioctl)		/* ioctl routine */
 		__P((struct ifnet *, int, caddr_t));
-	void	(*if_reset)	
+	void	(*if_reset)
 		__P((int));		/* new autoconfig will permit removal */
 	void	(*if_watchdog)		/* timer routine */
 		__P((int));
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index 5872595..7e80531 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if_loop.c	8.1 (Berkeley) 6/10/93
- *	$Id: if_disc.c,v 1.2 1995/03/17 22:02:18 wollman Exp $
+ *	$Id: if_disc.c,v 1.3 1995/03/20 19:20:39 wollman Exp $
  */
 
 /*
@@ -135,7 +135,7 @@ dsoutput(ifp, m, dst, rt)
 		m0.m_next = m;
 		m0.m_len = 4;
 		m0.m_data = (char *)&af;
-		
+
 		bpf_mtap(dsif.if_bpf, &m0);
 	}
 #endif
diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h
index f3db94a..e76b88a 100644
--- a/sys/net/if_dl.h
+++ b/sys/net/if_dl.h
@@ -31,25 +31,25 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
- * $Id: if_dl.h,v 1.2 1994/08/02 07:46:12 davidg Exp $
+ * $Id: if_dl.h,v 1.3 1994/08/21 05:11:41 paul Exp $
  */
 
 #ifndef _NET_IF_DL_H_
 #define _NET_IF_DL_H_
 
-/* 
+/*
  * A Link-Level Sockaddr may specify the interface in one of two
  * ways: either by means of a system-provided index number (computed
  * anew and possibly differently on every reboot), or by a human-readable
  * string such as "il0" (for managerial convenience).
- * 
+ *
  * Census taking actions, such as something akin to SIOCGCONF would return
  * both the index and the human name.
- * 
+ *
  * High volume transactions (such as giving a link-level ``from'' address
  * in a recvfrom or recvmsg call) may be likely only to provide the indexed
  * form, (which requires fewer copy operations and less space).
- * 
+ *
  * The form and interpretation  of the link-level address is purely a matter
  * of convention between the device driver and its consumers; however, it is
  * expected that all drivers for an interface of a given if_type will agree.
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 07d7867..18c45f4 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ethersubr.c,v 1.6 1995/03/16 18:14:25 bde Exp $
+ * $Id: if_ethersubr.c,v 1.7 1995/05/09 13:35:39 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -115,7 +115,7 @@ ether_output(ifp, m0, dst, rt0)
 		if ((rt->rt_flags & RTF_UP) == 0) {
 			if (rt0 = rt = rtalloc1(dst, 1, 0UL))
 				rt->rt_refcnt--;
-			else 
+			else
 				senderr(EHOSTUNREACH);
 		}
 		if (rt->rt_flags & RTF_GATEWAY) {
@@ -123,7 +123,7 @@ ether_output(ifp, m0, dst, rt0)
 				goto lookup;
 			if (((rt = rt->rt_gwroute)->rt_flags & RTF_UP) == 0) {
 				rtfree(rt); rt = rt0;
-			lookup: rt->rt_gwroute = rtalloc1(rt->rt_gateway, 1, 
+			lookup: rt->rt_gwroute = rtalloc1(rt->rt_gateway, 1,
 							  0UL);
 				if ((rt = rt->rt_gwroute) == 0)
 					senderr(EHOSTUNREACH);
@@ -206,7 +206,7 @@ ether_output(ifp, m0, dst, rt0)
 #ifdef	LLC
 /*	case AF_NSAP: */
 	case AF_CCITT: {
-		register struct sockaddr_dl *sdl = 
+		register struct sockaddr_dl *sdl =
 			(struct sockaddr_dl *) rt -> rt_gateway;
 
 		if (sdl && sdl->sdl_family == AF_LINK
@@ -234,14 +234,14 @@ ether_output(ifp, m0, dst, rt0)
 			printf("ether_output: sending LLC2 pkt to: ");
 			for (i=0; i<6; i++)
 				printf("%x ", edst[i] & 0xff);
-			printf(" len 0x%x dsap 0x%x ssap 0x%x control 0x%x\n", 
+			printf(" len 0x%x dsap 0x%x ssap 0x%x control 0x%x\n",
 			       type & 0xff, l->llc_dsap & 0xff, l->llc_ssap &0xff,
 			       l->llc_control & 0xff);
 
 		}
 #endif /* LLC_DEBUG */
 		} break;
-#endif /* LLC */	
+#endif /* LLC */
 
 	case AF_UNSPEC:
 		eh = (struct ether_header *)dst->sa_data;
@@ -356,7 +356,7 @@ ether_input(ifp, eh, m)
 		l = mtod(m, struct llc *);
 		switch (l->llc_dsap) {
 #ifdef	ISO
-		case LLC_ISO_LSAP: 
+		case LLC_ISO_LSAP:
 			switch (l->llc_control) {
 			case LLC_UI:
 				/* LLC_UI_P forbidden in class 1 service */
@@ -380,7 +380,7 @@ ether_input(ifp, eh, m)
 					break;
 				}
 				goto dropanyway;
-				
+
 			case LLC_XID:
 			case LLC_XID_P:
 				if(m->m_len < 6)
@@ -408,7 +408,7 @@ ether_input(ifp, eh, m)
 				eh2 = (struct ether_header *)sa.sa_data;
 				for (i = 0; i < 6; i++) {
 					eh2->ether_shost[i] = c = eh->ether_dhost[i];
-					eh2->ether_dhost[i] = 
+					eh2->ether_dhost[i] =
 						eh->ether_dhost[i] = eh->ether_shost[i];
 					eh->ether_shost[i] = c;
 				}
@@ -430,7 +430,7 @@ ether_input(ifp, eh, m)
 			if (m == 0)
 				return;
 			if ( !sdl_sethdrif(ifp, eh->ether_shost, LLC_X25_LSAP,
-					    eh->ether_dhost, LLC_X25_LSAP, 6, 
+					    eh->ether_dhost, LLC_X25_LSAP, 6,
 					    mtod(m, struct sdl_hdr *)))
 				panic("ETHER cons addr failure");
 			mtod(m, struct sdl_hdr *)->sdlhdr_len = ether_type;
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 1ffdb2b..41ea156 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
- * $Id: if_fddisubr.c,v 1.3 1995/03/16 18:14:26 bde Exp $
+ * $Id: if_fddisubr.c,v 1.4 1995/05/09 13:35:40 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -134,7 +134,7 @@ fddi_output(ifp, m0, dst, rt0)
 		if ((rt->rt_flags & RTF_UP) == 0) {
 			if (rt0 = rt = RTALLOC1(dst, 1))
 				rt->rt_refcnt--;
-			else 
+			else
 				senderr(EHOSTUNREACH);
 		}
 		if (rt->rt_flags & RTF_GATEWAY) {
@@ -222,7 +222,7 @@ fddi_output(ifp, m0, dst, rt0)
 #ifdef	LLC
 /*	case AF_NSAP: */
 	case AF_CCITT: {
-		register struct sockaddr_dl *sdl = 
+		register struct sockaddr_dl *sdl =
 			(struct sockaddr_dl *) rt -> rt_gateway;
 
 		if (sdl && sdl->sdl_family == AF_LINK
@@ -251,14 +251,14 @@ fddi_output(ifp, m0, dst, rt0)
 			printf("fddi_output: sending LLC2 pkt to: ");
 			for (i=0; i<6; i++)
 				printf("%x ", edst[i] & 0xff);
-			printf(" len 0x%x dsap 0x%x ssap 0x%x control 0x%x\n", 
+			printf(" len 0x%x dsap 0x%x ssap 0x%x control 0x%x\n",
 			       type & 0xff, l->llc_dsap & 0xff, l->llc_ssap &0xff,
 			       l->llc_control & 0xff);
 
 		}
 #endif /* LLC_DEBUG */
 		} break;
-#endif /* LLC */	
+#endif /* LLC */
 
 	case AF_UNSPEC:
 	{
@@ -440,7 +440,7 @@ fddi_input(ifp, fh, m)
 	}
 #endif /* INET || NS */
 #ifdef	ISO
-	case LLC_ISO_LSAP: 
+	case LLC_ISO_LSAP:
 		switch (l->llc_control) {
 		case LLC_UI:
 			/* LLC_UI_P forbidden in class 1 service */
@@ -462,7 +462,7 @@ fddi_input(ifp, fh, m)
 				break;
 			}
 			goto dropanyway;
-			
+
 		case LLC_XID:
 		case LLC_XID_P:
 			if(m->m_len < 6)
@@ -490,7 +490,7 @@ fddi_input(ifp, fh, m)
 			eh2 = (struct ether_header *)sa.sa_data;
 			for (i = 0; i < 6; i++) {
 				eh2->ether_shost[i] = c = eh->fddi_dhost[i];
-				eh2->ether_dhost[i] = 
+				eh2->ether_dhost[i] =
 					eh->ether_dhost[i] = eh->fddi_shost[i];
 				eh2->ether_shost[i] = c;
 			}
@@ -511,7 +511,7 @@ fddi_input(ifp, fh, m)
 		if (m == 0)
 			return;
 		if ( !sdl_sethdrif(ifp, fh->fddi_shost, LLC_X25_LSAP,
-				    fh->fddi_dhost, LLC_X25_LSAP, 6, 
+				    fh->fddi_dhost, LLC_X25_LSAP, 6,
 				    mtod(m, struct sdl_hdr *)))
 			panic("ETHER cons addr failure");
 		mtod(m, struct sdl_hdr *)->sdlhdr_len = m->m_pkthdr.len - sizeof(struct sdl_hdr);
@@ -523,7 +523,7 @@ fddi_input(ifp, fh, m)
 		break;
 	}
 #endif /* LLC */
-		
+
 	default:
 		printf("fddi_input: unknown dsap 0x%x\n", l->llc_dsap);
 		ifp->if_noproto++;
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 708da73..7673f7e 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $Id: if_loop.c,v 1.8 1995/03/20 19:20:41 wollman Exp $
+ * $Id: if_loop.c,v 1.9 1995/04/26 18:10:45 pst Exp $
  */
 
 /*
@@ -138,7 +138,7 @@ looutput(ifp, m, dst, rt)
 		m0.m_next = m;
 		m0.m_len = 4;
 		m0.m_data = (char *)&af;
-		
+
 		bpf_mtap(ifp->if_bpf, &m0);
 	}
 #endif
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 6adb512..c0672ca 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -69,7 +69,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: if_ppp.c,v 1.11 1995/03/20 19:20:42 wollman Exp $ */
+/* $Id: if_ppp.c,v 1.12 1995/03/29 20:34:17 ache Exp $ */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 
 #include "ppp.h"
@@ -273,7 +273,7 @@ pppdealloc(sc)
     }
     sc->sc_if.if_flags &= ~(IFF_UP|IFF_RUNNING);
 }
-    
+
 /*
  * Line specific open routine for async tty devices.
  * Attach the given tty to the first available ppp unit.
@@ -304,7 +304,7 @@ pppopen(dev, tp)
 	m_freem(sc->sc_outm);
 	sc->sc_outm = NULL;
     }
-	
+
     if (pppgetm(sc) == 0) {
 	sc->sc_if.if_flags &= ~(IFF_UP|IFF_RUNNING);
 	return (ENOBUFS);
@@ -670,7 +670,7 @@ pppoutput(ifp, m0, dst, rt)
 	    error = ENETDOWN;
 	    goto bad;
 	}
-	
+
 	/*
 	 * If this is a TCP packet to or from an "interactive" port,
 	 * put the packet on the fastq instead.
@@ -1314,7 +1314,7 @@ pppinput(c, tp)
 	sc->sc_ilen = 0;
 	sc->sc_if.if_ibytes = sc->sc_bytesrcvd;
 
-	if (sc->sc_rawin_count > 0) 
+	if (sc->sc_rawin_count > 0)
 	    ppplogchar(sc, -1);
 
 	/*
diff --git a/sys/net/if_ppp.h b/sys/net/if_ppp.h
index 9f70af0..97df728 100644
--- a/sys/net/if_ppp.h
+++ b/sys/net/if_ppp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: if_ppp.h,v 1.5 1994/01/25 05:56:08 deraadt Exp $
+ * $Id: if_ppp.h,v 1.2 1994/09/23 00:13:20 wollman Exp $
  */
 
 #ifndef _IF_PPP_H_
@@ -86,7 +86,7 @@ struct ppp_softc {
 	u_int	sc_bytessent;	/* count of octets sent */
 	u_int	sc_bytesrcvd;	/* count of octets received */
 	caddr_t	sc_bpf;		/* hook for BPF */
-	
+
 	/* Device-dependent part for async lines. */
 	ext_accm sc_asyncmap;	/* async control character map */
 	u_long	sc_rasyncmap;	/* receive async control char map */
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 1e1fa68..6ddd878 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_sl.c	8.6 (Berkeley) 2/1/94
- * $Id: if_sl.c,v 1.18 1995/04/02 00:11:48 bde Exp $
+ * $Id: if_sl.c,v 1.19 1995/04/28 18:47:28 ache Exp $
  */
 
 /*
@@ -60,7 +60,7 @@
  * pinging you can use up all your bandwidth).  Made low clist behavior
  * more robust and slightly less likely to hang serial line.
  * Sped up a bunch of things.
- * 
+ *
  * Note that splimp() is used throughout to block both (tty) input
  * interrupts and network activity; thus, splimp must be >= spltty.
  */
diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h
index 2fb3f9f..ade190f 100644
--- a/sys/net/if_slvar.h
+++ b/sys/net/if_slvar.h
@@ -32,7 +32,7 @@
  *
  *	@(#)if_slvar.h	8.3 (Berkeley) 2/1/94
  *
- * $Id: if_slvar.h,v 1.4 1994/10/08 01:40:23 phk Exp $
+ * $Id: if_slvar.h,v 1.5 1995/03/30 20:43:32 ache Exp $
  */
 
 #ifndef _NET_IF_SLVAR_H_
@@ -40,7 +40,7 @@
 
 /*
  * Definitions for SLIP interface data structures
- * 
+ *
  * (This exists so programs like slstats can get at the definition
  *  of sl_softc.)
  */
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index a2a1965..42037f1 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -196,7 +196,7 @@ tunclose(dev_t dev, int foo, int bar, struct proc *p)
 	}
 	tp->tun_pgrp = 0;
 	selwakeup(&tp->tun_rsel);
-		
+
 	TUNDEBUG ("%s%d: closed\n", ifp->if_name, ifp->if_unit);
 	return (0);
 }
@@ -388,7 +388,7 @@ tunioctl(dev, cmd, data, flag, p)
 		s = splimp();
 		if (tp->tun_if.if_snd.ifq_head)
 			*(int *)data = tp->tun_if.if_snd.ifq_head->m_len;
-		else	
+		else
 			*(int *)data = 0;
 		splx(s);
 		break;
diff --git a/sys/net/if_tun.h b/sys/net/if_tun.h
index 50af6bc..b287636 100644
--- a/sys/net/if_tun.h
+++ b/sys/net/if_tun.h
@@ -12,7 +12,7 @@
  * roots in a similar driver written by Phil Cockcroft (formerly) at
  * UCL. This driver is based much more on read/write/select mode of
  * operation though.
- * 
+ *
  * : $Header: if_tnreg.h,v 1.1.2.1 1992/07/16 22:39:16 friedl Exp
  */
 
diff --git a/sys/net/pppcompress.c b/sys/net/pppcompress.c
index 8c7abdb..5485b0f 100644
--- a/sys/net/pppcompress.c
+++ b/sys/net/pppcompress.c
@@ -44,9 +44,9 @@
  * so that the entire packet being decompressed doesn't have
  * to be in contiguous memory (just the compressed header).
  *
- *	$Id: pppcompress.c,v 1.2 1994/09/23 00:13:21 wollman Exp $
+ *	$Id: pppcompress.c,v 1.3 1994/11/01 09:03:20 pst Exp $
  */
-  
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/net/pppcompress.h b/sys/net/pppcompress.h
index ed30971..93f3e51 100644
--- a/sys/net/pppcompress.h
+++ b/sys/net/pppcompress.h
@@ -39,7 +39,7 @@
  *	- added sl_uncompress_tcp_part.
  *
  *	From: 	slcompress.h	7.4	90/06/28
- *	$Id: slcompress.h,v 1.5 1994/01/15 20:13:16 deraadt Exp $
+ *	$Id: pppcompress.h,v 1.2 1994/09/23 00:13:22 wollman Exp $
  */
 
 #ifndef _NET_PPPCOMPRESS_H_
@@ -60,7 +60,7 @@
  * sequence number changes, one change per bit set in the header
  * (there may be no changes and there are two special cases where
  * the receiver implicitly knows what changed -- see below).
- * 
+ *
  * There are 5 numbers which can change (they are always inserted
  * in the following order): TCP urgent pointer, window,
  * acknowlegement, sequence number and IP ID.  (The urgent pointer
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 6616277..7073d60 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.c	8.4 (Berkeley) 11/2/94
- *	$Id$
+ *	$Id: radix.c,v 1.8 1995/04/28 23:01:34 pst Exp $
  */
 
 /*
@@ -76,18 +76,18 @@ static char *rn_zeros, *rn_ones;
  * We define the index of a route to associated with the mask to be
  * the first bit number in the mask where 0 occurs (with bit number 0
  * representing the highest order bit).
- * 
+ *
  * We say a mask is normal if every bit is 0, past the index of the mask.
  * If a node n has a descendant (k, m) with index(m) == index(n) == rn_b,
  * and m is a normal mask, then the route applies to every descendant of n.
  * If the index(m) < rn_b, this implies the trailing last few bits of k
  * before bit b are all 0, (and hence consequently true of every descendant
  * of n), so the route applies to all descendants of the node as well.
- * 
+ *
  * Similar logic shows that a non-normal mask m such that
  * index(m) <= index(n) could potentially apply to many children of n.
  * Thus, for each non-host route, we attach its mask to a list at an internal
- * node as high in the tree as we can go. 
+ * node as high in the tree as we can go.
  *
  * The present version of the code makes use of normal routes in short-
  * circuiting an explict mask and compare operation when testing whether
@@ -300,7 +300,7 @@ on1:
 	} while (t != top);
 	return 0;
 };
-		
+
 #ifdef RN_DEBUG
 int	rn_nodenum;
 struct	radix_node *rn_clist;
@@ -364,7 +364,7 @@ on1:
 	cp = v;
 	do {
 		p = x;
-		if (cp[x->rn_off] & x->rn_bmask) 
+		if (cp[x->rn_off] & x->rn_bmask)
 			x = x->rn_r;
 		else x = x->rn_l;
 	} while (b > (unsigned) x->rn_b); /* x->rn_b < b && x->rn_b >= 0 */
@@ -452,7 +452,7 @@ rn_addmask(n_arg, search, skip)
 	for (cp = netmask + skip; (cp < cplim) && *(u_char *)cp == 0xff;)
 		cp++;
 	if (cp != cplim) {
-		for (j = 0x80; (j & *cp) != 0; j >>= 1)  
+		for (j = 0x80; (j & *cp) != 0; j >>= 1)
 			b++;
 		if (*cp != normal_chars[b] || cp != (cplim - 1))
 			isnormal = 0;
@@ -472,7 +472,7 @@ rn_lexobetter(m_arg, n_arg)
 
 	if (*mp > *np)
 		return 1;  /* not really, but need to check longer one first */
-	if (*mp == *np) 
+	if (*mp == *np)
 		for (lim = mp + *mp; mp < lim;)
 			if (*mp++ > *np++)
 				return 1;
@@ -594,7 +594,7 @@ rn_addroute(v_arg, n_arg, head, treenodes)
 	b_leaf = -1 - t->rn_b;
 	if (t->rn_r == saved_tt) x = t->rn_l; else x = t->rn_r;
 	/* Promote general routes from below */
-	if (x->rn_b < 0) { 
+	if (x->rn_b < 0) {
 	    for (mp = &t->rn_mklist; x; x = x->rn_dupedkey)
 		if (x->rn_mask && (x->rn_b >= b_leaf) && x->rn_mklist == 0) {
 			*mp = m = rn_new_radix_mask(x, 0);
@@ -691,7 +691,7 @@ rn_delete(v_arg, netmask_arg, head)
 			log(LOG_ERR, "rn_delete: inconsistent annotation\n");
 			return 0;  /* dangling ref could cause disaster */
 		}
-	} else { 
+	} else {
 		if (m->rm_mask != tt->rn_mask) {
 			log(LOG_ERR, "rn_delete: inconsistent annotation\n");
 			goto on1;
@@ -865,7 +865,7 @@ rn_walktree_from(h, a, m, f, w)
 	 * while applying the function f to it, so we need to calculate
 	 * the successor node in advance.
 	 */
-	while (rn->rn_b >= 0) 
+	while (rn->rn_b >= 0)
 		rn = rn->rn_l;
 
 	while (!stopping) {
@@ -875,7 +875,7 @@ rn_walktree_from(h, a, m, f, w)
 		while (rn->rn_p->rn_r == rn && !(rn->rn_flags & RNF_ROOT)) {
 			rn = rn->rn_p;
 
-			/* if went up beyond last, stop */ 
+			/* if went up beyond last, stop */
 			if (rn->rn_b < lastb) {
 				stopping = 1;
 				/* printf("up too far\n"); */
@@ -890,7 +890,7 @@ rn_walktree_from(h, a, m, f, w)
 		while ((rn = base) != 0) {
 			base = rn->rn_dupedkey;
 			/* printf("leaf %p\n", rn); */
-			if (!(rn->rn_flags & RNF_ROOT) 
+			if (!(rn->rn_flags & RNF_ROOT)
 			    && (error = (*f)(rn, w)))
 				return (error);
 		}
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 0572378..dfb08e4 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
- * $Id: raw_cb.c,v 1.2 1994/08/02 07:46:34 davidg Exp $
+ * $Id: raw_cb.c,v 1.3 1994/10/08 22:38:24 phk Exp $
  */
 
 #include <sys/param.h>
@@ -49,7 +49,7 @@
 #include <netinet/in.h>
 
 /*
- * Routines to manage the raw protocol control blocks. 
+ * Routines to manage the raw protocol control blocks.
  *
  * TODO:
  *	hash lookups by protocol family/protocol + address family
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index c66f5ef..bf6f6bb 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id: raw_usrreq.c,v 1.4 1994/10/08 22:38:25 phk Exp $
+ * $Id: raw_usrreq.c,v 1.5 1995/02/16 01:11:38 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -191,7 +191,7 @@ raw_usrreq(so, req, m, nam, control)
 	 * If a socket isn't bound to a single address,
 	 * the raw input routine will hand it anything
 	 * within that protocol family (assuming there's
-	 * nothing else around it should go to). 
+	 * nothing else around it should go to).
 	 */
 	case PRU_CONNECT:
 		error = EINVAL;
diff --git a/sys/net/route.c b/sys/net/route.c
index a75cbc3..ca705b5 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.2 (Berkeley) 11/15/93
- *	$Id: route.c,v 1.20 1995/03/23 18:07:29 wollman Exp $
+ *	$Id: route.c,v 1.22 1995/04/25 19:12:07 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -146,7 +146,7 @@ void
 rtfree(rt)
 	register struct rtentry *rt;
 {
-	register struct radix_node_head *rnh = 
+	register struct radix_node_head *rnh =
 		rt_tables[rt_key(rt)->sa_family];
 	register struct ifaddr *ifa;
 
@@ -237,7 +237,7 @@ rtredirect(dst, gateway, netmask, flags, src, rtp)
 		goto create;
 	/*
 	 * Don't listen to the redirect if it's
-	 * for a route to an interface. 
+	 * for a route to an interface.
 	 */
 	if (rt->rt_flags & RTF_GATEWAY) {
 		if (((rt->rt_flags & RTF_HOST) == 0) && (flags & RTF_HOST)) {
@@ -510,7 +510,7 @@ rt_fixdelete(struct radix_node *rn, void *vp)
 	struct rtentry *rt0 = vp;
 
 	if (rt->rt_parent == rt0 && !(rt->rt_flags & RTF_PINNED)) {
-		return rtrequest(RTM_DELETE, rt_key(rt), 
+		return rtrequest(RTM_DELETE, rt_key(rt),
 				 (struct sockaddr *)0, rt_mask(rt),
 				 rt->rt_flags, (struct rtentry **)0);
 	}
@@ -519,13 +519,13 @@ rt_fixdelete(struct radix_node *rn, void *vp)
 
 /*
  * This routine is called from rt_setgate() to do the analogous thing for
- * adds and changes.  There is the added complication in this case of a 
+ * adds and changes.  There is the added complication in this case of a
  * middle insert; i.e., insertion of a new network route between an older
  * network route and (cloned) host routes.  For this reason, a simple check
  * of rt->rt_parent is insufficient; each candidate route must be tested
  * against the (mask, value) of the new route (passed as before in vp)
  * to see if the new route matches it.  Unfortunately, this has the obnoxious
- * property of also triggering for insertion /above/ a pre-existing network 
+ * property of also triggering for insertion /above/ a pre-existing network
  * route and clones.  Sigh.  This may be fixed some day.
  *
  * XXX - it may be possible to do fixdelete() for changes and reserve this
@@ -562,7 +562,7 @@ rt_fixchange(struct radix_node *rn, void *vp)
 #ifdef DEBUG
 		if(rtfcdebug) printf("parent match\n");
 #endif
-		return rtrequest(RTM_DELETE, rt_key(rt), 
+		return rtrequest(RTM_DELETE, rt_key(rt),
 				 (struct sockaddr *)0, rt_mask(rt),
 				 rt->rt_flags, (struct rtentry **)0);
 	}
@@ -570,7 +570,7 @@ rt_fixchange(struct radix_node *rn, void *vp)
 	/*
 	 * There probably is a function somewhere which does this...
 	 * if not, there should be.
-	 */	
+	 */
 	len = imin(((struct sockaddr *)rt_key(rt0))->sa_len,
 		   ((struct sockaddr *)rt_key(rt))->sa_len);
 
@@ -655,7 +655,7 @@ rt_setgate(rt0, dst, gate)
 		struct rtfc_arg arg;
 		arg.rnh = rnh;
 		arg.rt0 = rt;
-		rnh->rnh_walktree_from(rnh, rt_key(rt), rt_mask(rt), 
+		rnh->rnh_walktree_from(rnh, rt_key(rt), rt_mask(rt),
 				       rt_fixchange, &arg);
 	}
 
diff --git a/sys/net/route.h b/sys/net/route.h
index 58178ab..e12f986 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.h	8.3 (Berkeley) 4/19/94
- * $Id: route.h,v 1.12 1995/02/08 20:01:13 wollman Exp $
+ * $Id: route.h,v 1.13 1995/03/20 21:30:21 wollman Exp $
  */
 
 #ifndef _NET_ROUTE_H_
@@ -39,7 +39,7 @@
 
 /*
  * Kernel resident routing tables.
- * 
+ *
  * The routing tables are initialized when interface addresses
  * are set by making entries for all directly connected interfaces.
  */
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 0db23bc..7e65578 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rtsock.c	8.5 (Berkeley) 11/2/94
- *	$Id: rtsock.c,v 1.11 1995/05/11 00:13:11 wollman Exp $
+ *	$Id: rtsock.c,v 1.12 1995/05/15 22:57:53 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -308,7 +308,7 @@ flush:
 	if (rtm) {
 		if (error)
 			rtm->rtm_errno = error;
-		else 
+		else
 			rtm->rtm_flags |= RTF_DONE;
 	}
 	if (rt)
@@ -606,7 +606,7 @@ rt_newaddrmsg(cmd, ifa, error, rt)
 		if ((cmd == RTM_ADD && pass == 2) ||
 		    (cmd == RTM_DELETE && pass == 1)) {
 			register struct rt_msghdr *rtm;
-			
+
 			if (rt == 0)
 				continue;
 			netmask = rt_mask(rt);
diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index 42106d5..5630b51 100644
--- a/sys/net/slcompress.c
+++ b/sys/net/slcompress.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slcompress.c	8.2 (Berkeley) 4/16/94
- * $Id: slcompress.c,v 1.3 1994/08/18 22:35:22 wollman Exp $
+ * $Id: slcompress.c,v 1.4 1994/10/08 22:38:27 phk Exp $
  */
 
 /*
@@ -272,7 +272,7 @@ sl_compress_tcp(m, ip, comp, compress_cid)
 		 * with it. */
 		 goto uncompressed;
 
-	deltaS = (u_short)(ntohs(th->th_win) - ntohs(oth->th_win)); 
+	deltaS = (u_short)(ntohs(th->th_win) - ntohs(oth->th_win));
 	if (deltaS) {
 		ENCODE(deltaS);
 		changes |= NEW_W;
diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h
index 75e3a58..239f633 100644
--- a/sys/net/slcompress.h
+++ b/sys/net/slcompress.h
@@ -35,7 +35,7 @@
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
- * $Id: slcompress.h,v 1.4 1994/08/21 19:06:48 paul Exp $
+ * $Id: slcompress.h,v 1.5 1994/08/22 14:16:36 bde Exp $
  */
 
 #ifndef _NET_SLCOMPRESS_H_
@@ -56,7 +56,7 @@
  * sequence number changes, one change per bit set in the header
  * (there may be no changes and there are two special cases where
  * the receiver implicitly knows what changed -- see below).
- * 
+ *
  * There are 5 numbers which can change (they are always inserted
  * in the following order): TCP urgent pointer, window,
  * acknowlegement, sequence number and IP ID.  (The urgent pointer