From 82ed7fc286c3bb79321873e5ff358f4725a3fd09 Mon Sep 17 00:00:00 2001
From: Robert Garrett <rob@dragonflybsd.org>
Date: Sat, 26 Jul 2003 20:19:34 +0000
Subject: [PATCH] Register keyword removal

Approved by: Matt Dillon
---
 sys/net/bpf.c                  | 70 +++++++++++++++---------------
 sys/net/bpf_filter.c           | 50 +++++++++++-----------
 sys/net/disc/if_disc.c         | 16 +++----
 sys/net/ef/if_ef.c             |  4 +-
 sys/net/if.c                   | 56 ++++++++++++------------
 sys/net/if_atmsubr.c           | 14 +++---
 sys/net/if_ethersubr.c         | 20 ++++-----
 sys/net/if_fddisubr.c          | 22 +++++-----
 sys/net/if_iso88025subr.c      | 20 ++++-----
 sys/net/if_loop.c              | 20 ++++-----
 sys/net/if_media.c             |  4 +-
 sys/net/ppp/if_ppp.c           |  8 ++--
 sys/net/ppp_layer/ppp_tty.c    | 38 ++++++++---------
 sys/net/ppp_layer/slcompress.c | 42 +++++++++---------
 sys/net/radix.c                | 68 ++++++++++++++---------------
 sys/net/raw_cb.c               | 12 +++---
 sys/net/route.c                | 46 ++++++++++----------
 sys/net/rtsock.c               | 78 +++++++++++++++++-----------------
 sys/net/sl/if_sl.c             | 70 +++++++++++++++---------------
 sys/net/tun/if_tun.c           | 10 ++---
 sys/net/zlib.c                 | 38 ++++++++---------
 21 files changed, 353 insertions(+), 353 deletions(-)

diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index ec7a25c117..65d637707d 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -38,7 +38,7 @@
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
  * $FreeBSD: src/sys/net/bpf.c,v 1.59.2.12 2002/04/14 21:41:48 luigi Exp $
- * $DragonFly: src/sys/net/bpf.c,v 1.5 2003/07/21 05:50:43 dillon Exp $
+ * $DragonFly: src/sys/net/bpf.c,v 1.6 2003/07/26 20:19:33 rob Exp $
  */
 
 #include "bpf.h"
@@ -160,10 +160,10 @@ static struct cdevsw bpf_cdevsw = {
 
 static int
 bpf_movein(uio, linktype, mp, sockp, datlen)
-	register struct uio *uio;
+	struct uio *uio;
 	int linktype, *datlen;
-	register struct mbuf **mp;
-	register struct sockaddr *sockp;
+	struct mbuf **mp;
+	struct sockaddr *sockp;
 {
 	struct mbuf *m;
 	int error;
@@ -417,10 +417,10 @@ bpf_timeout(arg)
 
 int
 bpf_sleep(d)
-	register struct bpf_d *d;
+	struct bpf_d *d;
 {
-	register int rto = d->bd_rtout;
-	register int st;
+	int rto = d->bd_rtout;
+	int st;
 
 	if (rto != 0) {
 		d->bd_timedout = 0;
@@ -456,10 +456,10 @@ bpf_sleep(d)
 static	int
 bpfread(dev, uio, ioflag)
 	dev_t dev;
-	register struct uio *uio;
+	struct uio *uio;
 	int ioflag;
 {
-	register struct bpf_d *d = dev->si_drv1;
+	struct bpf_d *d = dev->si_drv1;
 	int timed_out;
 	int error;
 	int s;
@@ -561,7 +561,7 @@ bpfread(dev, uio, ioflag)
  */
 static inline void
 bpf_wakeup(d)
-	register struct bpf_d *d;
+	struct bpf_d *d;
 {
 	if (d->bd_state == BPF_WAITING) {
 		callout_stop(&d->bd_callout);
@@ -606,7 +606,7 @@ bpfwrite(dev, uio, ioflag)
 	struct uio *uio;
 	int ioflag;
 {
-	register struct bpf_d *d = dev->si_drv1;
+	struct bpf_d *d = dev->si_drv1;
 	struct ifnet *ifp;
 	struct mbuf *m;
 	int error, s;
@@ -749,7 +749,7 @@ bpfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td)
 		if (d->bd_bif != 0)
 			error = EINVAL;
 		else {
-			register u_int size = *(u_int *)addr;
+			u_int size = *(u_int *)addr;
 
 			if (size > bpf_maxbufsize)
 				*(u_int *)addr = size = bpf_maxbufsize;
@@ -1070,8 +1070,8 @@ bpf_setif(d, ifr)
 int
 bpfpoll(dev_t dev, int events, struct thread *td)
 {
-	register struct bpf_d *d;
-	register int s;
+	struct bpf_d *d;
+	int s;
 	int revents;
 
 	d = dev->si_drv1;
@@ -1114,12 +1114,12 @@ bpfpoll(dev_t dev, int events, struct thread *td)
 void
 bpf_tap(ifp, pkt, pktlen)
 	struct ifnet *ifp;
-	register u_char *pkt;
-	register u_int pktlen;
+	u_char *pkt;
+	u_int pktlen;
 {
 	struct bpf_if *bp;
-	register struct bpf_d *d;
-	register u_int slen;
+	struct bpf_d *d;
+	u_int slen;
 	/*
 	 * Note that the ipl does not have to be raised at this point.
 	 * The only problem that could arise here is that if two different
@@ -1142,10 +1142,10 @@ static void
 bpf_mcopy(src_arg, dst_arg, len)
 	const void *src_arg;
 	void *dst_arg;
-	register size_t len;
+	size_t len;
 {
-	register const struct mbuf *m;
-	register u_int count;
+	const struct mbuf *m;
+	u_int count;
 	u_char *dst;
 
 	m = src_arg;
@@ -1198,14 +1198,14 @@ bpf_mtap(ifp, m)
  */
 static void
 catchpacket(d, pkt, pktlen, snaplen, cpfn)
-	register struct bpf_d *d;
-	register u_char *pkt;
-	register u_int pktlen, snaplen;
-	register void (*cpfn) __P((const void *, void *, size_t));
+	struct bpf_d *d;
+	u_char *pkt;
+	u_int pktlen, snaplen;
+	void (*cpfn) __P((const void *, void *, size_t));
 {
-	register struct bpf_hdr *hp;
-	register int totlen, curlen;
-	register int hdrlen = d->bd_bif->bif_hdrlen;
+	struct bpf_hdr *hp;
+	int totlen, curlen;
+	int hdrlen = d->bd_bif->bif_hdrlen;
 	/*
 	 * Figure out how many bytes to move.  If the packet is
 	 * greater or equal to the snapshot length, transfer that
@@ -1271,7 +1271,7 @@ catchpacket(d, pkt, pktlen, snaplen, cpfn)
  */
 static int
 bpf_allocbufs(d)
-	register struct bpf_d *d;
+	struct bpf_d *d;
 {
 	d->bd_fbuf = (caddr_t)malloc(d->bd_bufsize, M_BPF, M_WAITOK);
 	if (d->bd_fbuf == 0)
@@ -1293,7 +1293,7 @@ bpf_allocbufs(d)
  */
 static void
 bpf_freed(d)
-	register struct bpf_d *d;
+	struct bpf_d *d;
 {
 	/*
 	 * We don't need to lock out interrupts since this descriptor has
@@ -1418,8 +1418,8 @@ SYSINIT(bpfdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,bpf_drvinit,NULL)
 void
 bpf_tap(ifp, pkt, pktlen)
 	struct ifnet *ifp;
-	register u_char *pkt;
-	register u_int pktlen;
+	u_char *pkt;
+	u_int pktlen;
 {
 }
 
@@ -1445,10 +1445,10 @@ bpfdetach(ifp)
 
 u_int
 bpf_filter(pc, p, wirelen, buflen)
-	register const struct bpf_insn *pc;
-	register u_char *p;
+	const struct bpf_insn *pc;
+	u_char *p;
 	u_int wirelen;
-	register u_int buflen;
+	u_int buflen;
 {
 	return -1;	/* "no filter" behaviour */
 }
diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c
index 6ae31279c8..7c2a2219a1 100644
--- a/sys/net/bpf_filter.c
+++ b/sys/net/bpf_filter.c
@@ -38,7 +38,7 @@
  *      @(#)bpf_filter.c	8.1 (Berkeley) 6/10/93
  *
  * $FreeBSD: src/sys/net/bpf_filter.c,v 1.17 1999/12/29 04:38:31 peter Exp $
- * $DragonFly: src/sys/net/bpf_filter.c,v 1.2 2003/06/17 04:28:47 dillon Exp $
+ * $DragonFly: src/sys/net/bpf_filter.c,v 1.3 2003/07/26 20:19:33 rob Exp $
  */
 
 #include <sys/param.h>
@@ -73,7 +73,7 @@
 #ifdef _KERNEL
 #define MINDEX(m, k) \
 { \
-	register int len = m->m_len; \
+	int len = m->m_len; \
  \
 	while (k >= len) { \
 		k -= len; \
@@ -89,13 +89,13 @@ static u_int32_t	m_xword __P((struct mbuf *m, bpf_u_int32 k, int *err));
 
 static u_int32_t
 m_xword(m, k, err)
-	register struct mbuf *m;
-	register bpf_u_int32 k;
-	register int *err;
+	struct mbuf *m;
+	bpf_u_int32 k;
+	int *err;
 {
-	register size_t len;
-	register u_char *cp, *np;
-	register struct mbuf *m0;
+	size_t len;
+	u_char *cp, *np;
+	struct mbuf *m0;
 
 	len = m->m_len;
 	while (k >= len) {
@@ -145,13 +145,13 @@ m_xword(m, k, err)
 
 static u_int16_t
 m_xhalf(m, k, err)
-	register struct mbuf *m;
-	register bpf_u_int32 k;
-	register int *err;
+	struct mbuf *m;
+	bpf_u_int32 k;
+	int *err;
 {
-	register size_t len;
-	register u_char *cp;
-	register struct mbuf *m0;
+	size_t len;
+	u_char *cp;
+	struct mbuf *m0;
 
 	len = m->m_len;
 	while (k >= len) {
@@ -184,13 +184,13 @@ m_xhalf(m, k, err)
  */
 u_int
 bpf_filter(pc, p, wirelen, buflen)
-	register const struct bpf_insn *pc;
-	register u_char *p;
+	const struct bpf_insn *pc;
+	u_char *p;
 	u_int wirelen;
-	register u_int buflen;
+	u_int buflen;
 {
-	register u_int32_t A = 0, X = 0;
-	register bpf_u_int32 k;
+	u_int32_t A = 0, X = 0;
+	bpf_u_int32 k;
 	int32_t mem[BPF_MEMWORDS];
 
 	if (pc == 0)
@@ -261,7 +261,7 @@ bpf_filter(pc, p, wirelen, buflen)
 			k = pc->k;
 			if (k >= buflen) {
 #ifdef _KERNEL
-				register struct mbuf *m;
+				struct mbuf *m;
 
 				if (buflen != 0)
 					return 0;
@@ -333,7 +333,7 @@ bpf_filter(pc, p, wirelen, buflen)
 			k = X + pc->k;
 			if (pc->k >= buflen || X >= buflen - pc->k) {
 #ifdef _KERNEL
-				register struct mbuf *m;
+				struct mbuf *m;
 
 				if (buflen != 0)
 					return 0;
@@ -352,7 +352,7 @@ bpf_filter(pc, p, wirelen, buflen)
 			k = pc->k;
 			if (k >= buflen) {
 #ifdef _KERNEL
-				register struct mbuf *m;
+				struct mbuf *m;
 
 				if (buflen != 0)
 					return 0;
@@ -522,8 +522,8 @@ bpf_validate(f, len)
 	const struct bpf_insn *f;
 	int len;
 {
-	register int i;
-	register const struct bpf_insn *p;
+	int i;
+	const struct bpf_insn *p;
 
 	for (i = 0; i < len; ++i) {
 		/*
@@ -532,7 +532,7 @@ bpf_validate(f, len)
 		 */
 		p = &f[i];
 		if (BPF_CLASS(p->code) == BPF_JMP) {
-			register int from = i + 1;
+			int from = i + 1;
 
 			if (BPF_OP(p->code) == BPF_JA) {
 				if (from >= len || p->k >= len - from)
diff --git a/sys/net/disc/if_disc.c b/sys/net/disc/if_disc.c
index 4db26c8dc2..4a64c0176c 100644
--- a/sys/net/disc/if_disc.c
+++ b/sys/net/disc/if_disc.c
@@ -32,7 +32,7 @@
  *
  *	From: @(#)if_loop.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/net/if_disc.c,v 1.26.2.2 2001/12/20 10:30:16 ru Exp $
- * $DragonFly: src/sys/net/disc/if_disc.c,v 1.2 2003/06/17 04:28:47 dillon Exp $
+ * $DragonFly: src/sys/net/disc/if_disc.c,v 1.3 2003/07/26 20:19:33 rob Exp $
  */
 
 /*
@@ -74,7 +74,7 @@ static int discioctl(struct ifnet *, u_long, caddr_t);
 static void
 discattach()
 {
-	register struct ifnet *ifp = &discif;
+	struct ifnet *ifp = &discif;
 
 	ifp->if_name = "ds";
 	ifp->if_mtu = DSMTU;
@@ -114,9 +114,9 @@ DECLARE_MODULE(if_disc, disc_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
 static int
 discoutput(ifp, m, dst, rt)
 	struct ifnet *ifp;
-	register struct mbuf *m;
+	struct mbuf *m;
 	struct sockaddr *dst;
-	register struct rtentry *rt;
+	struct rtentry *rt;
 {
 	if ((m->m_flags & M_PKTHDR) == 0)
 		panic("discoutput no HDR");
@@ -171,13 +171,13 @@ discrtrequest(cmd, rt, info)
 /* ARGSUSED */
 static int
 discioctl(ifp, cmd, data)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 	u_long cmd;
 	caddr_t data;
 {
-	register struct ifaddr *ifa;
-	register struct ifreq *ifr = (struct ifreq *)data;
-	register int error = 0;
+	struct ifaddr *ifa;
+	struct ifreq *ifr = (struct ifreq *)data;
+	int error = 0;
 
 	switch (cmd) {
 
diff --git a/sys/net/ef/if_ef.c b/sys/net/ef/if_ef.c
index 899c952779..197f2b9f9c 100644
--- a/sys/net/ef/if_ef.c
+++ b/sys/net/ef/if_ef.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/net/if_ef.c,v 1.2.2.4 2001/02/22 09:27:04 bp Exp $
- * $DragonFly: src/sys/net/ef/if_ef.c,v 1.2 2003/06/17 04:28:47 dillon Exp $
+ * $DragonFly: src/sys/net/ef/if_ef.c,v 1.3 2003/07/26 20:19:33 rob Exp $
  */
 
 #include "opt_inet.h"
@@ -163,7 +163,7 @@ ef_detach(struct efnet *sc)
 		if_down(ifp);
 		if (ifp->if_flags & IFF_RUNNING) {
 		    /* find internet addresses and delete routes */
-		    register struct ifaddr *ifa;
+		    struct ifaddr *ifa;
 		    TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 			    rtinit(ifa, (int)RTM_DELETE, 0);
 		    }
diff --git a/sys/net/if.c b/sys/net/if.c
index 36f3484d99..3c1c082d5c 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -32,7 +32,7 @@
  *
  *	@(#)if.c	8.3 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/net/if.c,v 1.85.2.23 2003/04/15 18:11:19 fjoe Exp $
- * $DragonFly: src/sys/net/if.c,v 1.4 2003/06/25 03:56:02 dillon Exp $
+ * $DragonFly: src/sys/net/if.c,v 1.5 2003/07/26 20:19:33 rob Exp $
  */
 
 #include "opt_compat.h"
@@ -148,8 +148,8 @@ if_attach(ifp)
 	unsigned socksize, ifasize;
 	int namelen, masklen;
 	char workbuf[64];
-	register struct sockaddr_dl *sdl;
-	register struct ifaddr *ifa;
+	struct sockaddr_dl *sdl;
+	struct ifaddr *ifa;
 	static int if_indexlim = 8;
 	static int inited;
 
@@ -538,10 +538,10 @@ if_clone_list(ifcr)
 /*ARGSUSED*/
 struct ifaddr *
 ifa_ifwithaddr(addr)
-	register struct sockaddr *addr;
+	struct sockaddr *addr;
 {
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
+	struct ifnet *ifp;
+	struct ifaddr *ifa;
 
 #define	equal(a1, a2) \
   (bcmp((caddr_t)(a1), (caddr_t)(a2), ((struct sockaddr *)(a1))->sa_len) == 0)
@@ -565,10 +565,10 @@ ifa_ifwithaddr(addr)
 /*ARGSUSED*/
 struct ifaddr *
 ifa_ifwithdstaddr(addr)
-	register struct sockaddr *addr;
+	struct sockaddr *addr;
 {
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
+	struct ifnet *ifp;
+	struct ifaddr *ifa;
 
 	TAILQ_FOREACH(ifp, &ifnet, if_link)
 	    if (ifp->if_flags & IFF_POINTOPOINT)
@@ -589,8 +589,8 @@ struct ifaddr *
 ifa_ifwithnet(addr)
 	struct sockaddr *addr;
 {
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
+	struct ifnet *ifp;
+	struct ifaddr *ifa;
 	struct ifaddr *ifa_maybe = (struct ifaddr *) 0;
 	u_int af = addr->sa_family;
 	char *addr_data = addr->sa_data, *cplim;
@@ -600,7 +600,7 @@ ifa_ifwithnet(addr)
 	 * so do that if we can.
 	 */
 	if (af == AF_LINK) {
-	    register struct sockaddr_dl *sdl = (struct sockaddr_dl *)addr;
+	    struct sockaddr_dl *sdl = (struct sockaddr_dl *)addr;
 	    if (sdl->sdl_index && sdl->sdl_index <= if_index)
 		return (ifnet_addrs[sdl->sdl_index - 1]);
 	}
@@ -611,7 +611,7 @@ ifa_ifwithnet(addr)
 	 */
 	TAILQ_FOREACH(ifp, &ifnet, if_link) {
 		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
-			register char *cp, *cp2, *cp3;
+			char *cp, *cp2, *cp3;
 
 			if (ifa->ifa_addr->sa_family != af)
 next:				continue;
@@ -681,11 +681,11 @@ next:				continue;
 struct ifaddr *
 ifaof_ifpforaddr(addr, ifp)
 	struct sockaddr *addr;
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 {
-	register struct ifaddr *ifa;
-	register char *cp, *cp2, *cp3;
-	register char *cplim;
+	struct ifaddr *ifa;
+	char *cp, *cp2, *cp3;
+	char *cplim;
 	struct ifaddr *ifa_maybe = 0;
 	u_int af = addr->sa_family;
 
@@ -730,10 +730,10 @@ ifaof_ifpforaddr(addr, ifp)
 static void
 link_rtrequest(cmd, rt, info)
 	int cmd;
-	register struct rtentry *rt;
+	struct rtentry *rt;
 	struct rt_addrinfo *info;
 {
-	register struct ifaddr *ifa;
+	struct ifaddr *ifa;
 	struct sockaddr *dst;
 	struct ifnet *ifp;
 
@@ -757,10 +757,10 @@ link_rtrequest(cmd, rt, info)
  */
 void
 if_unroute(ifp, flag, fam)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 	int flag, fam;
 {
-	register struct ifaddr *ifa;
+	struct ifaddr *ifa;
 
 	ifp->if_flags &= ~flag;
 	getmicrotime(&ifp->if_lastchange);
@@ -778,10 +778,10 @@ if_unroute(ifp, flag, fam)
  */
 void
 if_route(ifp, flag, fam)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 	int flag, fam;
 {
-	register struct ifaddr *ifa;
+	struct ifaddr *ifa;
 
 	ifp->if_flags |= flag;
 	getmicrotime(&ifp->if_lastchange);
@@ -801,7 +801,7 @@ if_route(ifp, flag, fam)
  */
 void
 if_down(ifp)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 {
 
 	if_unroute(ifp, IFF_UP, AF_UNSPEC);
@@ -814,7 +814,7 @@ if_down(ifp)
  */
 void
 if_up(ifp)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 {
 
 	if_route(ifp, IFF_UP, AF_UNSPEC);
@@ -825,9 +825,9 @@ if_up(ifp)
  */
 static void
 if_qflush(ifq)
-	register struct ifqueue *ifq;
+	struct ifqueue *ifq;
 {
-	register struct mbuf *m, *n;
+	struct mbuf *m, *n;
 
 	n = ifq->ifq_head;
 	while ((m = n) != 0) {
@@ -848,7 +848,7 @@ static void
 if_slowtimo(arg)
 	void *arg;
 {
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 	int s = splimp();
 
 	TAILQ_FOREACH(ifp, &ifnet, if_link) {
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index ee9880c3be..6b6cec7b52 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/net/if_atmsubr.c,v 1.10.2.1 2001/03/06 00:29:26 obrien Exp $
- * $DragonFly: src/sys/net/if_atmsubr.c,v 1.2 2003/06/17 04:28:47 dillon Exp $
+ * $DragonFly: src/sys/net/if_atmsubr.c,v 1.3 2003/07/26 20:19:33 rob Exp $
  */
 
 /*
@@ -90,7 +90,7 @@
 
 int
 atm_output(ifp, m0, dst, rt0)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 	struct mbuf *m0;
 	struct sockaddr *dst;
 	struct rtentry *rt0;
@@ -230,11 +230,11 @@ bad:
 void
 atm_input(ifp, ah, m, rxhand)
 	struct ifnet *ifp;
-	register struct atm_pseudohdr *ah;
+	struct atm_pseudohdr *ah;
 	struct mbuf *m;
 	void *rxhand;
 {
-	register struct ifqueue *inq;
+	struct ifqueue *inq;
 	u_int16_t etype = ETHERTYPE_IP; /* default */
 	int s;
 
@@ -316,10 +316,10 @@ atm_input(ifp, ah, m, rxhand)
  */
 void
 atm_ifattach(ifp)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 {
-	register struct ifaddr *ifa;
-	register struct sockaddr_dl *sdl;
+	struct ifaddr *ifa;
+	struct sockaddr_dl *sdl;
 
 	ifp->if_type = IFT_ATM;
 	ifp->if_addrlen = 0;
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 68e04d1275..872cda7181 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -32,7 +32,7 @@
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.70.2.33 2003/04/28 15:45:53 archie Exp $
- * $DragonFly: src/sys/net/if_ethersubr.c,v 1.3 2003/06/19 00:54:14 dillon Exp $
+ * $DragonFly: src/sys/net/if_ethersubr.c,v 1.4 2003/07/26 20:19:33 rob Exp $
  */
 
 #include "opt_atalk.h"
@@ -140,7 +140,7 @@ static int ether_ipfw;
  */
 int
 ether_output(ifp, m, dst, rt0)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 	struct mbuf *m;
 	struct sockaddr *dst;
 	struct rtentry *rt0;
@@ -148,8 +148,8 @@ ether_output(ifp, m, dst, rt0)
 	short type;
 	int error = 0, hdrcmplt = 0;
  	u_char esrc[6], edst[6];
-	register struct rtentry *rt;
-	register struct ether_header *eh;
+	struct rtentry *rt;
+	struct ether_header *eh;
 	int loop_copy = 0;
 	int hlen;	/* link layer header lenght */
 	struct arpcom *ac = IFP2AC(ifp);
@@ -642,7 +642,7 @@ ether_demux(ifp, eh, m)
 	struct ifqueue *inq;
 	u_short ether_type;
 #if defined(NETATALK)
-	register struct llc *l;
+	struct llc *l;
 #endif
 	struct ip_fw *rule = NULL;
 
@@ -833,11 +833,11 @@ post_stats:
  */
 void
 ether_ifattach(ifp, bpf)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 	int bpf;
 {
-	register struct ifaddr *ifa;
-	register struct sockaddr_dl *sdl;
+	struct ifaddr *ifa;
+	struct sockaddr_dl *sdl;
 
 	ifp->if_type = IFT_ETHER;
 	ifp->if_addrlen = 6;
@@ -910,7 +910,7 @@ ether_ioctl(ifp, command, data)
 		 */
 		case AF_IPX:
 			{
-			register struct ipx_addr *ina = &(IA_SIPX(ifa)->sipx_addr);
+			struct ipx_addr *ina = &(IA_SIPX(ifa)->sipx_addr);
 			struct arpcom *ac = IFP2AC(ifp);
 
 			if (ipx_nullhost(*ina))
@@ -936,7 +936,7 @@ ether_ioctl(ifp, command, data)
 		 */
 		case AF_NS:
 		{
-			register struct ns_addr *ina = &(IA_SNS(ifa)->sns_addr);
+			struct ns_addr *ina = &(IA_SNS(ifa)->sns_addr);
 			struct arpcom *ac = IFP2AC(ifp);
 
 			if (ns_nullhost(*ina))
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index e6b8833b3a..a6853f14fc 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -34,7 +34,7 @@
  *
  *	from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
  * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.41.2.8 2002/02/20 23:34:09 fjoe Exp $
- * $DragonFly: src/sys/net/Attic/if_fddisubr.c,v 1.2 2003/06/17 04:28:47 dillon Exp $
+ * $DragonFly: src/sys/net/Attic/if_fddisubr.c,v 1.3 2003/07/26 20:19:33 rob Exp $
  */
 
 #include "opt_atalk.h"
@@ -123,7 +123,7 @@ static	int fddi_resolvemulti __P((struct ifnet *, struct sockaddr **,
  */
 int
 fddi_output(ifp, m, dst, rt0)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 	struct mbuf *m;
 	struct sockaddr *dst;
 	struct rtentry *rt0;
@@ -131,8 +131,8 @@ fddi_output(ifp, m, dst, rt0)
 	u_int16_t type;
 	int s, loop_copy = 0, error = 0, hdrcmplt = 0;
  	u_char esrc[6], edst[6];
-	register struct rtentry *rt;
-	register struct fddi_header *fh;
+	struct rtentry *rt;
+	struct fddi_header *fh;
 	struct arpcom *ac = (struct arpcom *)ifp;
 
 	if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING))
@@ -297,7 +297,7 @@ fddi_output(ifp, m, dst, rt0)
 	}
 
 	if (type != 0) {
-		register struct llc *l;
+		struct llc *l;
 		M_PREPEND(m, sizeof (struct llc), M_DONTWAIT);
 		if (m == 0)
 			senderr(ENOBUFS);
@@ -383,11 +383,11 @@ bad:
 void
 fddi_input(ifp, fh, m)
 	struct ifnet *ifp;
-	register struct fddi_header *fh;
+	struct fddi_header *fh;
 	struct mbuf *m;
 {
-	register struct ifqueue *inq;
-	register struct llc *l;
+	struct ifqueue *inq;
+	struct llc *l;
 	int s;
 
 	if ((ifp->if_flags & IFF_UP) == 0) {
@@ -534,10 +534,10 @@ fddi_input(ifp, fh, m)
 
 void
 fddi_ifattach(ifp)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 {
-	register struct ifaddr *ifa;
-	register struct sockaddr_dl *sdl;
+	struct ifaddr *ifa;
+	struct sockaddr_dl *sdl;
 
 	ifp->if_type = IFT_FDDI;
 	ifp->if_addrlen = 6;
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index 8a42801ddf..796016fd79 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/net/if_iso88025subr.c,v 1.7.2.7 2002/06/18 00:15:31 kbyanc Exp $
- * $DragonFly: src/sys/net/Attic/if_iso88025subr.c,v 1.2 2003/06/17 04:28:48 dillon Exp $
+ * $DragonFly: src/sys/net/Attic/if_iso88025subr.c,v 1.3 2003/07/26 20:19:33 rob Exp $
  *
  */
 
@@ -86,8 +86,8 @@
 void
 iso88025_ifattach(struct ifnet *ifp)
 {
-    register struct ifaddr *ifa = NULL;
-    register struct sockaddr_dl *sdl;
+    struct ifaddr *ifa = NULL;
+    struct sockaddr_dl *sdl;
 
     ifp->if_type = IFT_ISO88025;
     ifp->if_addrlen = ISO88025_ADDR_LEN;
@@ -162,14 +162,14 @@ iso88025_ioctl(struct ifnet *ifp, int command, caddr_t data)
 int
 iso88025_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct rtentry *rt0)
 {
-	register struct iso88025_header *th;
+	struct iso88025_header *th;
 	struct iso88025_header gen_th;
-	register struct iso88025_sockaddr_data *sd = (struct iso88025_sockaddr_data *)dst->sa_data;
-        register struct llc *l;
-	register struct sockaddr_dl *sdl = NULL;
+	struct iso88025_sockaddr_data *sd = (struct iso88025_sockaddr_data *)dst->sa_data;
+        struct llc *l;
+	struct sockaddr_dl *sdl = NULL;
         int s, error = 0, rif_len = 0;
  	u_char edst[6];
-	register struct rtentry *rt;
+	struct rtentry *rt;
 	int len = m->m_pkthdr.len, loop_copy = 0;
 	struct arpcom *ac = (struct arpcom *)ifp;
 
@@ -331,10 +331,10 @@ bad:
 void
 iso88025_input(struct ifnet *ifp, struct iso88025_header *th, struct mbuf *m)
 {
-	register struct ifqueue *inq;
+	struct ifqueue *inq;
 	u_short ether_type;
 	int s;
-	register struct llc *l = mtod(m, struct llc *);
+	struct llc *l = mtod(m, struct llc *);
 
 	if ((ifp->if_flags & IFF_UP) == 0) {
 		m_freem(m);
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 63fbe61f2d..8d464520ac 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -32,7 +32,7 @@
  *
  *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/net/if_loop.c,v 1.47.2.8 2003/06/01 01:46:11 silby Exp $
- * $DragonFly: src/sys/net/if_loop.c,v 1.2 2003/06/17 04:28:48 dillon Exp $
+ * $DragonFly: src/sys/net/if_loop.c,v 1.3 2003/07/26 20:19:33 rob Exp $
  */
 
 /*
@@ -111,8 +111,8 @@ static void
 loopattach(dummy)
 	void *dummy;
 {
-	register struct ifnet *ifp;
-	register int i = 0;
+	struct ifnet *ifp;
+	int i = 0;
 
 	for (ifp = loif; i < NLOOP; ifp++) {
 	    ifp->if_name = "lo";
@@ -131,9 +131,9 @@ loopattach(dummy)
 int
 looutput(ifp, m, dst, rt)
 	struct ifnet *ifp;
-	register struct mbuf *m;
+	struct mbuf *m;
 	struct sockaddr *dst;
-	register struct rtentry *rt;
+	struct rtentry *rt;
 {
 	struct mbuf *n;
 
@@ -204,7 +204,7 @@ if_simloop(ifp, m, af, hlen)
 	int hlen;
 {
 	int s, isr;
-	register struct ifqueue *ifq = 0;
+	struct ifqueue *ifq = 0;
 
 	KASSERT((m->m_flags & M_PKTHDR) != 0, ("if_simloop: no HDR"));
 	m->m_pkthdr.rcvif = ifp;
@@ -333,13 +333,13 @@ lortrequest(cmd, rt, info)
 /* ARGSUSED */
 int
 loioctl(ifp, cmd, data)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 	u_long cmd;
 	caddr_t data;
 {
-	register struct ifaddr *ifa;
-	register struct ifreq *ifr = (struct ifreq *)data;
-	register int error = 0;
+	struct ifaddr *ifa;
+	struct ifreq *ifr = (struct ifreq *)data;
+	int error = 0;
 
 	switch (cmd) {
 
diff --git a/sys/net/if_media.c b/sys/net/if_media.c
index 2f10fa75b9..59d5a5e47b 100644
--- a/sys/net/if_media.c
+++ b/sys/net/if_media.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: if_media.c,v 1.1 1997/03/17 02:55:15 thorpej Exp $	*/
 /* $FreeBSD: src/sys/net/if_media.c,v 1.9.2.4 2001/07/04 00:12:38 brooks Exp $ */
-/* $DragonFly: src/sys/net/if_media.c,v 1.2 2003/06/17 04:28:48 dillon Exp $ */
+/* $DragonFly: src/sys/net/if_media.c,v 1.3 2003/07/26 20:19:33 rob Exp $ */
 
 /*
  * Copyright (c) 1997
@@ -114,7 +114,7 @@ ifmedia_add(ifm, mword, data, aux)
 	int data;
 	void *aux;
 {
-	register struct ifmedia_entry *entry;
+	struct ifmedia_entry *entry;
 
 #ifdef IFMEDIA_DEBUG
 	if (ifmedia_debug) {
diff --git a/sys/net/ppp/if_ppp.c b/sys/net/ppp/if_ppp.c
index d529111e27..859a9885bf 100644
--- a/sys/net/ppp/if_ppp.c
+++ b/sys/net/ppp/if_ppp.c
@@ -70,7 +70,7 @@
  */
 
 /* $FreeBSD: src/sys/net/if_ppp.c,v 1.67.2.4 2002/04/14 21:41:48 luigi Exp $ */
-/* $DragonFly: src/sys/net/ppp/if_ppp.c,v 1.4 2003/06/25 03:56:02 dillon Exp $ */
+/* $DragonFly: src/sys/net/ppp/if_ppp.c,v 1.5 2003/07/26 20:19:33 rob Exp $ */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
 
@@ -196,8 +196,8 @@ static void
 pppattach(dummy)
     void *dummy;
 {
-    register struct ppp_softc *sc;
-    register int i = 0;
+    struct ppp_softc *sc;
+    int i = 0;
 
     for (sc = ppp_softc; i < NPPP; sc++) {
 	sc->sc_if.if_name = "ppp";
@@ -680,7 +680,7 @@ pppoutput(ifp, m0, dst, rtp)
     struct sockaddr *dst;
     struct rtentry *rtp;
 {
-    register struct ppp_softc *sc = &ppp_softc[ifp->if_unit];
+    struct ppp_softc *sc = &ppp_softc[ifp->if_unit];
     int protocol, address, control;
     u_char *cp;
     int s, error;
diff --git a/sys/net/ppp_layer/ppp_tty.c b/sys/net/ppp_layer/ppp_tty.c
index a919c707fc..2565070be4 100644
--- a/sys/net/ppp_layer/ppp_tty.c
+++ b/sys/net/ppp_layer/ppp_tty.c
@@ -71,7 +71,7 @@
  */
 
 /* $FreeBSD: src/sys/net/ppp_tty.c,v 1.43.2.1 2002/02/13 00:43:11 dillon Exp $ */
-/* $DragonFly: src/sys/net/ppp_layer/ppp_tty.c,v 1.5 2003/07/19 21:14:43 dillon Exp $ */
+/* $DragonFly: src/sys/net/ppp_layer/ppp_tty.c,v 1.6 2003/07/26 20:19:33 rob Exp $ */
 
 #include "opt_ppp.h"		/* XXX for ppp_defs.h */
 
@@ -266,7 +266,7 @@ pppclose(tp, flag)
     struct tty *tp;
     int flag;
 {
-    register struct ppp_softc *sc;
+    struct ppp_softc *sc;
     int s;
 
     s = spltty();
@@ -316,9 +316,9 @@ pppasyncrelinq(sc)
  */
 static void
 pppasyncsetmtu(sc)
-register struct ppp_softc *sc;
+struct ppp_softc *sc;
 {
-    register struct tty *tp = (struct tty *) sc->sc_devp;
+    struct tty *tp = (struct tty *) sc->sc_devp;
     int s;
 
     s = spltty();
@@ -335,13 +335,13 @@ register struct ppp_softc *sc;
  */
 static int
 pppread(tp, uio, flag)
-    register struct tty *tp;
+    struct tty *tp;
     struct uio *uio;
     int flag;
 {
-    register struct ppp_softc *sc = (struct ppp_softc *)tp->t_sc;
+    struct ppp_softc *sc = (struct ppp_softc *)tp->t_sc;
     struct mbuf *m, *m0;
-    register int s;
+    int s;
     int error = 0;
 
     if (sc == NULL)
@@ -394,11 +394,11 @@ pppread(tp, uio, flag)
  */
 static int
 pppwrite(tp, uio, flag)
-    register struct tty *tp;
+    struct tty *tp;
     struct uio *uio;
     int flag;
 {
-    register struct ppp_softc *sc = (struct ppp_softc *)tp->t_sc;
+    struct ppp_softc *sc = (struct ppp_softc *)tp->t_sc;
     struct mbuf *m, *m0, **mp;
     struct sockaddr dst;
     int len, error, s;
@@ -561,12 +561,12 @@ pppfcs(u_short fcs, u_char *cp, int len)
  */
 static void
 pppasyncstart(sc)
-    register struct ppp_softc *sc;
+    struct ppp_softc *sc;
 {
-    register struct tty *tp = (struct tty *) sc->sc_devp;
-    register struct mbuf *m;
-    register int len;
-    register u_char *start, *stop, *cp;
+    struct tty *tp = (struct tty *) sc->sc_devp;
+    struct mbuf *m;
+    int len;
+    u_char *start, *stop, *cp;
     int n, ndone, done, idle;
     int s;
 
@@ -767,9 +767,9 @@ pppasyncctlp(sc)
  */
 int
 pppstart(tp)
-    register struct tty *tp;
+    struct tty *tp;
 {
-    register struct ppp_softc *sc = (struct ppp_softc *) tp->t_sc;
+    struct ppp_softc *sc = (struct ppp_softc *) tp->t_sc;
 
     /*
      * Call output process whether or not there is any output.
@@ -814,7 +814,7 @@ ppp_timeout(x)
  */
 static void
 pppgetm(sc)
-    register struct ppp_softc *sc;
+    struct ppp_softc *sc;
 {
     struct mbuf *m, **mp;
     int len;
@@ -849,9 +849,9 @@ static unsigned paritytab[8] = {
 static int
 pppinput(c, tp)
     int c;
-    register struct tty *tp;
+    struct tty *tp;
 {
-    register struct ppp_softc *sc;
+    struct ppp_softc *sc;
     struct mbuf *m;
     int ilen, s;
 
diff --git a/sys/net/ppp_layer/slcompress.c b/sys/net/ppp_layer/slcompress.c
index c731d1270d..78c29717c1 100644
--- a/sys/net/ppp_layer/slcompress.c
+++ b/sys/net/ppp_layer/slcompress.c
@@ -32,7 +32,7 @@
  *
  *	@(#)slcompress.c	8.2 (Berkeley) 4/16/94
  * $FreeBSD: src/sys/net/slcompress.c,v 1.16 1999/12/29 04:38:37 peter Exp $
- * $DragonFly: src/sys/net/ppp_layer/slcompress.c,v 1.2 2003/06/17 04:28:48 dillon Exp $
+ * $DragonFly: src/sys/net/ppp_layer/slcompress.c,v 1.3 2003/07/26 20:19:34 rob Exp $
  */
 
 /*
@@ -72,8 +72,8 @@ sl_compress_init(comp, max_state)
 	struct slcompress *comp;
 	int max_state;
 {
-	register u_int i;
-	register struct cstate *tstate = comp->tstate;
+	u_int i;
+	struct cstate *tstate = comp->tstate;
 
 	if (max_state == -1) {
 		max_state = MAX_STATES - 1;
@@ -162,18 +162,18 @@ sl_compress_init(comp, max_state)
 u_int
 sl_compress_tcp(m, ip, comp, compress_cid)
 	struct mbuf *m;
-	register struct ip *ip;
+	struct ip *ip;
 	struct slcompress *comp;
 	int compress_cid;
 {
-	register struct cstate *cs = comp->last_cs->cs_next;
-	register u_int hlen = ip->ip_hl;
-	register struct tcphdr *oth;
-	register struct tcphdr *th;
-	register u_int deltaS, deltaA;
-	register u_int changes = 0;
+	struct cstate *cs = comp->last_cs->cs_next;
+	u_int hlen = ip->ip_hl;
+	struct tcphdr *oth;
+	struct tcphdr *th;
+	u_int deltaS, deltaA;
+	u_int changes = 0;
 	u_char new_seq[16];
-	register u_char *cp = new_seq;
+	u_char *cp = new_seq;
 
 	/*
 	 * Bail if this is an IP fragment or if the TCP packet isn't
@@ -210,8 +210,8 @@ sl_compress_tcp(m, ip, comp, compress_cid)
 		 * states via linear search.  If we don't find a state
 		 * for the datagram, the oldest state is (re-)used.
 		 */
-		register struct cstate *lcs;
-		register struct cstate *lastcs = comp->last_cs;
+		struct cstate *lcs;
+		struct cstate *lastcs = comp->last_cs;
 
 		do {
 			lcs = cs; cs = cs->cs_next;
@@ -476,13 +476,13 @@ sl_uncompress_tcp_core(buf, buflen, total_len, type, comp, hdrp, hlenp)
 	u_char **hdrp;
 	u_int *hlenp;
 {
-	register u_char *cp;
-	register u_int hlen, changes;
-	register struct tcphdr *th;
-	register struct cstate *cs;
-	register struct ip *ip;
-	register u_int16_t *bp;
-	register u_int vjlen;
+	u_char *cp;
+	u_int hlen, changes;
+	struct tcphdr *th;
+	struct cstate *cs;
+	struct ip *ip;
+	u_int16_t *bp;
+	u_int vjlen;
 
 	switch (type) {
 
@@ -550,7 +550,7 @@ sl_uncompress_tcp_core(buf, buflen, total_len, type, comp, hdrp, hlenp)
 	switch (changes & SPECIALS_MASK) {
 	case SPECIAL_I:
 		{
-		register u_int i = ntohs(cs->cs_ip.ip_len) - cs->cs_hlen;
+		u_int i = ntohs(cs->cs_ip.ip_len) - cs->cs_hlen;
 		th->th_ack = htonl(ntohl(th->th_ack) + i);
 		th->th_seq = htonl(ntohl(th->th_seq) + i);
 		}
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 39ccc009d4..d6993a4f29 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -32,7 +32,7 @@
  *
  *	@(#)radix.c	8.4 (Berkeley) 11/2/94
  * $FreeBSD: src/sys/net/radix.c,v 1.20.2.3 2002/04/28 05:40:25 suz Exp $
- * $DragonFly: src/sys/net/radix.c,v 1.2 2003/06/17 04:28:48 dillon Exp $
+ * $DragonFly: src/sys/net/radix.c,v 1.3 2003/07/26 20:19:33 rob Exp $
  */
 
 /*
@@ -120,8 +120,8 @@ rn_search(v_arg, head)
 	void *v_arg;
 	struct radix_node *head;
 {
-	register struct radix_node *x;
-	register caddr_t v;
+	struct radix_node *x;
+	caddr_t v;
 
 	for (x = head, v = v_arg; x->rn_bit >= 0;) {
 		if (x->rn_bmask & v[x->rn_offset])
@@ -137,8 +137,8 @@ rn_search_m(v_arg, head, m_arg)
 	struct radix_node *head;
 	void *v_arg, *m_arg;
 {
-	register struct radix_node *x;
-	register caddr_t v = v_arg, m = m_arg;
+	struct radix_node *x;
+	caddr_t v = v_arg, m = m_arg;
 
 	for (x = head; x->rn_bit >= 0;) {
 		if ((x->rn_bmask & m[x->rn_offset]) &&
@@ -154,8 +154,8 @@ int
 rn_refines(m_arg, n_arg)
 	void *m_arg, *n_arg;
 {
-	register caddr_t m = m_arg, n = n_arg;
-	register caddr_t lim, lim2 = lim = n + *(u_char *)n;
+	caddr_t m = m_arg, n = n_arg;
+	caddr_t lim, lim2 = lim = n + *(u_char *)n;
 	int longer = (*(u_char *)n++) - (int)(*(u_char *)m++);
 	int masks_are_equal = 1;
 
@@ -182,7 +182,7 @@ rn_lookup(v_arg, m_arg, head)
 	void *v_arg, *m_arg;
 	struct radix_node_head *head;
 {
-	register struct radix_node *x;
+	struct radix_node *x;
 	caddr_t netmask = 0;
 
 	if (m_arg) {
@@ -202,10 +202,10 @@ rn_lookup(v_arg, m_arg, head)
 static int
 rn_satsifies_leaf(trial, leaf, skip)
 	char *trial;
-	register struct radix_node *leaf;
+	struct radix_node *leaf;
 	int skip;
 {
-	register char *cp = trial, *cp2 = leaf->rn_key, *cp3 = leaf->rn_mask;
+	char *cp = trial, *cp2 = leaf->rn_key, *cp3 = leaf->rn_mask;
 	char *cplim;
 	int length = min(*(u_char *)cp, *(u_char *)cp2);
 
@@ -226,12 +226,12 @@ rn_match(v_arg, head)
 	struct radix_node_head *head;
 {
 	caddr_t v = v_arg;
-	register struct radix_node *t = head->rnh_treetop, *x;
-	register caddr_t cp = v, cp2;
+	struct radix_node *t = head->rnh_treetop, *x;
+	caddr_t cp = v, cp2;
 	caddr_t cplim;
 	struct radix_node *saved_t, *top = t;
 	int off = t->rn_offset, vlen = *(u_char *)cp, matched_off;
-	register int test, b, rn_bit;
+	int test, b, rn_bit;
 
 	/*
 	 * Open code rn_search(v, top) to avoid overhead of extra
@@ -296,7 +296,7 @@ on1:
 	t = saved_t;
 	/* start searching up the tree */
 	do {
-		register struct radix_mask *m;
+		struct radix_mask *m;
 		t = t->rn_parent;
 		m = t->rn_mklist;
 		/*
@@ -336,7 +336,7 @@ rn_newpair(v, b, nodes)
 	int b;
 	struct radix_node nodes[2];
 {
-	register struct radix_node *tt = nodes, *t = tt + 1;
+	struct radix_node *tt = nodes, *t = tt + 1;
 	t->rn_bit = b;
 	t->rn_bmask = 0x80 >> (b & 7);
 	t->rn_left = tt;
@@ -365,16 +365,16 @@ rn_insert(v_arg, head, dupentry, nodes)
 	caddr_t v = v_arg;
 	struct radix_node *top = head->rnh_treetop;
 	int head_off = top->rn_offset, vlen = (int)*((u_char *)v);
-	register struct radix_node *t = rn_search(v_arg, top);
-	register caddr_t cp = v + head_off;
-	register int b;
+	struct radix_node *t = rn_search(v_arg, top);
+	caddr_t cp = v + head_off;
+	int b;
 	struct radix_node *tt;
     	/*
 	 * Find first bit at which v and t->rn_key differ
 	 */
     {
-	register caddr_t cp2 = t->rn_key + head_off;
-	register int cmp_res;
+	caddr_t cp2 = t->rn_key + head_off;
+	int cmp_res;
 	caddr_t cplim = v + vlen;
 
 	while (cp < cplim)
@@ -389,7 +389,7 @@ on1:
 		cmp_res >>= 1;
     }
     {
-	register struct radix_node *p, *x = top;
+	struct radix_node *p, *x = top;
 	cp = v;
 	do {
 		p = x;
@@ -431,9 +431,9 @@ rn_addmask(n_arg, search, skip)
 	void *n_arg;
 {
 	caddr_t netmask = (caddr_t)n_arg;
-	register struct radix_node *x;
-	register caddr_t cp, cplim;
-	register int b = 0, mlen, j;
+	struct radix_node *x;
+	caddr_t cp, cplim;
+	int b = 0, mlen, j;
 	int maskduplicated, m0, isnormal;
 	struct radix_node *saved_x;
 	static int last_zeroed = 0;
@@ -502,7 +502,7 @@ static int	/* XXX: arbitrary ordering for non-contiguous masks */
 rn_lexobetter(m_arg, n_arg)
 	void *m_arg, *n_arg;
 {
-	register u_char *mp = m_arg, *np = n_arg, *lim;
+	u_char *mp = m_arg, *np = n_arg, *lim;
 
 	if (*mp > *np)
 		return 1;  /* not really, but need to check longer one first */
@@ -515,10 +515,10 @@ rn_lexobetter(m_arg, n_arg)
 
 static struct radix_mask *
 rn_new_radix_mask(tt, next)
-	register struct radix_node *tt;
-	register struct radix_mask *next;
+	struct radix_node *tt;
+	struct radix_mask *next;
 {
-	register struct radix_mask *m;
+	struct radix_mask *m;
 
 	MKGet(m);
 	if (m == 0) {
@@ -544,7 +544,7 @@ rn_addroute(v_arg, n_arg, head, treenodes)
 	struct radix_node treenodes[2];
 {
 	caddr_t v = (caddr_t)v_arg, netmask = (caddr_t)n_arg;
-	register struct radix_node *t, *x = 0, *tt;
+	struct radix_node *t, *x = 0, *tt;
 	struct radix_node *saved_tt, *top = head->rnh_treetop;
 	short b = 0, b_leaf = 0;
 	int keyduplicated;
@@ -697,7 +697,7 @@ rn_delete(v_arg, netmask_arg, head)
 	void *v_arg, *netmask_arg;
 	struct radix_node_head *head;
 {
-	register struct radix_node *t, *p, *x, *tt;
+	struct radix_node *t, *p, *x, *tt;
 	struct radix_mask *m, *saved_m, **mp;
 	struct radix_node *dupedkey, *saved_tt, *top;
 	caddr_t v, netmask;
@@ -892,7 +892,7 @@ rn_walktree_from(h, a, m, f, w)
 	struct radix_node *base, *next;
 	u_char *xa = (u_char *)a;
 	u_char *xm = (u_char *)m;
-	register struct radix_node *rn, *last = 0 /* shut up gcc */;
+	struct radix_node *rn, *last = 0 /* shut up gcc */;
 	int stopping = 0;
 	int lastb;
 
@@ -980,7 +980,7 @@ rn_walktree(h, f, w)
 {
 	int error;
 	struct radix_node *base, *next;
-	register struct radix_node *rn = h->rnh_treetop;
+	struct radix_node *rn = h->rnh_treetop;
 	/*
 	 * This gets complicated because we may delete the node
 	 * while applying the function f to it, so we need to calculate
@@ -1018,8 +1018,8 @@ rn_inithead(head, off)
 	void **head;
 	int off;
 {
-	register struct radix_node_head *rnh;
-	register struct radix_node *t, *tt, *ttt;
+	struct radix_node_head *rnh;
+	struct radix_node *t, *tt, *ttt;
 	if (*head)
 		return (1);
 	R_Malloc(rnh, struct radix_node_head *, sizeof (*rnh));
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 48c1624a30..60d61b80a6 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -32,7 +32,7 @@
  *
  *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/net/raw_cb.c,v 1.16 1999/08/28 00:48:27 peter Exp $
- * $DragonFly: src/sys/net/raw_cb.c,v 1.2 2003/06/17 04:28:48 dillon Exp $
+ * $DragonFly: src/sys/net/raw_cb.c,v 1.3 2003/07/26 20:19:33 rob Exp $
  */
 
 #include <sys/param.h>
@@ -64,10 +64,10 @@ static u_long	raw_recvspace = RAWRCVQ;
  */
 int
 raw_attach(so, proto)
-	register struct socket *so;
+	struct socket *so;
 	int proto;
 {
-	register struct rawcb *rp = sotorawcb(so);
+	struct rawcb *rp = sotorawcb(so);
 	int error;
 
 	/*
@@ -93,7 +93,7 @@ raw_attach(so, proto)
  */
 void
 raw_detach(rp)
-	register struct rawcb *rp;
+	struct rawcb *rp;
 {
 	struct socket *so = rp->rcb_socket;
 
@@ -130,11 +130,11 @@ raw_disconnect(rp)
 
 int
 raw_bind(so, nam)
-	register struct socket *so;
+	struct socket *so;
 	struct mbuf *nam;
 {
 	struct sockaddr *addr = mtod(nam, struct sockaddr *);
-	register struct rawcb *rp;
+	struct rawcb *rp;
 
 	if (ifnet == 0)
 		return (EADDRNOTAVAIL);
diff --git a/sys/net/route.c b/sys/net/route.c
index cc79d009a3..c88ba0dfba 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -32,7 +32,7 @@
  *
  *	@(#)route.c	8.3 (Berkeley) 1/9/95
  * $FreeBSD: src/sys/net/route.c,v 1.59.2.10 2003/01/17 08:04:00 ru Exp $
- * $DragonFly: src/sys/net/route.c,v 1.3 2003/06/25 03:56:02 dillon Exp $
+ * $DragonFly: src/sys/net/route.c,v 1.4 2003/07/26 20:19:33 rob Exp $
  */
 
 #include "opt_inet.h"
@@ -86,14 +86,14 @@ route_init()
  */
 void
 rtalloc(ro)
-	register struct route *ro;
+	struct route *ro;
 {
 	rtalloc_ign(ro, 0UL);
 }
 
 void
 rtalloc_ign(ro, ignore)
-	register struct route *ro;
+	struct route *ro;
 	u_long ignore;
 {
 	struct rtentry *rt;
@@ -117,13 +117,13 @@ rtalloc_ign(ro, ignore)
  */
 struct rtentry *
 rtalloc1(dst, report, ignflags)
-	register struct sockaddr *dst;
+	struct sockaddr *dst;
 	int report;
 	u_long ignflags;
 {
-	register struct radix_node_head *rnh = rt_tables[dst->sa_family];
-	register struct rtentry *rt;
-	register struct radix_node *rn;
+	struct radix_node_head *rnh = rt_tables[dst->sa_family];
+	struct rtentry *rt;
+	struct radix_node *rn;
 	struct rtentry *newrt = 0;
 	struct rt_addrinfo info;
 	u_long nflags;
@@ -206,14 +206,14 @@ rtalloc1(dst, report, ignflags)
  */
 void
 rtfree(rt)
-	register struct rtentry *rt;
+	struct rtentry *rt;
 {
 	/*
 	 * find the tree for that address family
 	 */
-	register struct radix_node_head *rnh =
+	struct radix_node_head *rnh =
 		rt_tables[rt_key(rt)->sa_family];
-	register struct ifaddr *ifa;
+	struct ifaddr *ifa;
 
 	if (rt == 0 || rnh == 0)
 		panic("rtfree");
@@ -274,7 +274,7 @@ rtfree(rt)
 
 void
 ifafree(ifa)
-	register struct ifaddr *ifa;
+	struct ifaddr *ifa;
 {
 	if (ifa == NULL)
 		panic("ifafree");
@@ -412,7 +412,7 @@ ifa_ifwithroute(flags, dst, gateway)
 	int flags;
 	struct sockaddr	*dst, *gateway;
 {
-	register struct ifaddr *ifa;
+	struct ifaddr *ifa;
 	if ((flags & RTF_GATEWAY) == 0) {
 		/*
 		 * If we are adding a route to an interface,
@@ -537,9 +537,9 @@ rtrequest1(req, info, ret_nrt)
 	struct rtentry **ret_nrt;
 {
 	int s = splnet(); int error = 0;
-	register struct rtentry *rt;
-	register struct radix_node *rn;
-	register struct radix_node_head *rnh;
+	struct rtentry *rt;
+	struct radix_node *rn;
+	struct radix_node_head *rnh;
 	struct ifaddr *ifa;
 	struct sockaddr *ndst;
 #define senderr(x) { error = x ; goto bad; }
@@ -921,7 +921,7 @@ rt_setgate(rt0, dst, gate)
 {
 	caddr_t new, old;
 	int dlen = ROUNDUP(dst->sa_len), glen = ROUNDUP(gate->sa_len);
-	register struct rtentry *rt = rt0;
+	struct rtentry *rt = rt0;
 	struct radix_node_head *rnh = rt_tables[dst->sa_family];
 
 	/*
@@ -1024,9 +1024,9 @@ static void
 rt_maskedcopy(src, dst, netmask)
 	struct sockaddr *src, *dst, *netmask;
 {
-	register u_char *cp1 = (u_char *)src;
-	register u_char *cp2 = (u_char *)dst;
-	register u_char *cp3 = (u_char *)netmask;
+	u_char *cp1 = (u_char *)src;
+	u_char *cp2 = (u_char *)dst;
+	u_char *cp3 = (u_char *)netmask;
 	u_char *cplim = cp2 + *cp3;
 	u_char *cplim2 = cp2 + *cp1;
 
@@ -1046,12 +1046,12 @@ rt_maskedcopy(src, dst, netmask)
  */
 int
 rtinit(ifa, cmd, flags)
-	register struct ifaddr *ifa;
+	struct ifaddr *ifa;
 	int cmd, flags;
 {
-	register struct rtentry *rt;
-	register struct sockaddr *dst;
-	register struct sockaddr *deldst;
+	struct rtentry *rt;
+	struct sockaddr *dst;
+	struct sockaddr *deldst;
 	struct sockaddr *netmask;
 	struct mbuf *m = 0;
 	struct rtentry *nrt = 0;
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 2ddb5f56ea..759c529c8b 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -32,7 +32,7 @@
  *
  *	@(#)rtsock.c	8.7 (Berkeley) 10/12/95
  * $FreeBSD: src/sys/net/rtsock.c,v 1.44.2.11 2002/12/04 14:05:41 ru Exp $
- * $DragonFly: src/sys/net/rtsock.c,v 1.4 2003/06/25 03:56:02 dillon Exp $
+ * $DragonFly: src/sys/net/rtsock.c,v 1.5 2003/07/26 20:19:34 rob Exp $
  */
 
 
@@ -272,11 +272,11 @@ static struct pr_usrreqs route_usrreqs = {
 /*ARGSUSED*/
 static int
 route_output(m, so)
-	register struct mbuf *m;
+	struct mbuf *m;
 	struct socket *so;
 {
-	register struct rt_msghdr *rtm = 0;
-	register struct rtentry *rt = 0;
+	struct rt_msghdr *rtm = 0;
+	struct rtentry *rt = 0;
 	struct rtentry *saved_nrt = 0;
 	struct radix_node_head *rnh;
 	struct rt_addrinfo info;
@@ -424,7 +424,7 @@ route_output(m, so)
 			    (error = rt_setgate(rt, rt_key(rt), gate)) != 0)
 				senderr(error);
 			if ((ifa = info.rti_ifa) != NULL) {
-				register struct ifaddr *oifa = rt->rt_ifa;
+				struct ifaddr *oifa = rt->rt_ifa;
 				if (oifa != ifa) {
 				    if (oifa && oifa->ifa_rtrequest)
 					oifa->ifa_rtrequest(RTM_DELETE, rt,
@@ -466,7 +466,7 @@ flush:
 	if (rt)
 		rtfree(rt);
     {
-	register struct rawcb *rp = 0;
+	struct rawcb *rp = 0;
 	/*
 	 * Check to see if we don't want our own messages.
 	 */
@@ -504,7 +504,7 @@ flush:
 static void
 rt_setmetrics(which, in, out)
 	u_long which;
-	register struct rt_metrics *in, *out;
+	struct rt_metrics *in, *out;
 {
 #define metric(f, e) if (which & (f)) out->e = in->e;
 	metric(RTV_RPIPE, rmx_recvpipe);
@@ -530,11 +530,11 @@ rt_setmetrics(which, in, out)
  */
 static int
 rt_xaddrs(cp, cplim, rtinfo)
-	register caddr_t cp, cplim;
-	register struct rt_addrinfo *rtinfo;
+	caddr_t cp, cplim;
+	struct rt_addrinfo *rtinfo;
 {
-	register struct sockaddr *sa;
-	register int i;
+	struct sockaddr *sa;
+	int i;
 
 	for (i = 0; (i < RTAX_MAX) && (cp < cplim); i++) {
 		if ((rtinfo->rti_addrs & (1 << i)) == 0)
@@ -569,12 +569,12 @@ rt_xaddrs(cp, cplim, rtinfo)
 static struct mbuf *
 rt_msg1(type, rtinfo)
 	int type;
-	register struct rt_addrinfo *rtinfo;
+	struct rt_addrinfo *rtinfo;
 {
-	register struct rt_msghdr *rtm;
-	register struct mbuf *m;
-	register int i;
-	register struct sockaddr *sa;
+	struct rt_msghdr *rtm;
+	struct mbuf *m;
+	int i;
+	struct sockaddr *sa;
 	int len, dlen;
 
 	switch (type) {
@@ -637,11 +637,11 @@ rt_msg1(type, rtinfo)
 static int
 rt_msg2(type, rtinfo, cp, w)
 	int type;
-	register struct rt_addrinfo *rtinfo;
+	struct rt_addrinfo *rtinfo;
 	caddr_t cp;
 	struct walkarg *w;
 {
-	register int i;
+	int i;
 	int len, dlen, second_time = 0;
 	caddr_t cp0;
 
@@ -665,7 +665,7 @@ again:
 	if (cp0)
 		cp += len;
 	for (i = 0; i < RTAX_MAX; i++) {
-		register struct sockaddr *sa;
+		struct sockaddr *sa;
 
 		if ((sa = rtinfo->rti_info[i]) == 0)
 			continue;
@@ -679,7 +679,7 @@ again:
 	}
 	len = ALIGN(len);
 	if (cp == 0 && w != NULL && !second_time) {
-		register struct walkarg *rw = w;
+		struct walkarg *rw = w;
 
 		if (rw->w_req) {
 			if (rw->w_tmemsize < len) {
@@ -698,7 +698,7 @@ again:
 		}
 	}
 	if (cp) {
-		register struct rt_msghdr *rtm = (struct rt_msghdr *)cp0;
+		struct rt_msghdr *rtm = (struct rt_msghdr *)cp0;
 
 		rtm->rtm_version = RTM_VERSION;
 		rtm->rtm_type = type;
@@ -716,10 +716,10 @@ again:
 void
 rt_missmsg(type, rtinfo, flags, error)
 	int type, flags, error;
-	register struct rt_addrinfo *rtinfo;
+	struct rt_addrinfo *rtinfo;
 {
-	register struct rt_msghdr *rtm;
-	register struct mbuf *m;
+	struct rt_msghdr *rtm;
+	struct mbuf *m;
 	struct sockaddr *sa = rtinfo->rti_info[RTAX_DST];
 
 	if (route_cb.any_count == 0)
@@ -741,9 +741,9 @@ rt_missmsg(type, rtinfo, flags, error)
  */
 void
 rt_ifmsg(ifp)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 {
-	register struct if_msghdr *ifm;
+	struct if_msghdr *ifm;
 	struct mbuf *m;
 	struct rt_addrinfo info;
 
@@ -773,8 +773,8 @@ rt_ifmsg(ifp)
 void
 rt_newaddrmsg(cmd, ifa, error, rt)
 	int cmd, error;
-	register struct ifaddr *ifa;
-	register struct rtentry *rt;
+	struct ifaddr *ifa;
+	struct rtentry *rt;
 {
 	struct rt_addrinfo info;
 	struct sockaddr *sa = 0;
@@ -788,7 +788,7 @@ rt_newaddrmsg(cmd, ifa, error, rt)
 		bzero((caddr_t)&info, sizeof(info));
 		if ((cmd == RTM_ADD && pass == 1) ||
 		    (cmd == RTM_DELETE && pass == 2)) {
-			register struct ifa_msghdr *ifam;
+			struct ifa_msghdr *ifam;
 			int ncmd = cmd == RTM_ADD ? RTM_NEWADDR : RTM_DELADDR;
 
 			ifaaddr = sa = ifa->ifa_addr;
@@ -805,7 +805,7 @@ rt_newaddrmsg(cmd, ifa, error, rt)
 		}
 		if ((cmd == RTM_ADD && pass == 2) ||
 		    (cmd == RTM_DELETE && pass == 1)) {
-			register struct rt_msghdr *rtm;
+			struct rt_msghdr *rtm;
 
 			if (rt == 0)
 				continue;
@@ -899,8 +899,8 @@ sysctl_dumpentry(rn, vw)
 	struct radix_node *rn;
 	void *vw;
 {
-	register struct walkarg *w = vw;
-	register struct rtentry *rt = (struct rtentry *)rn;
+	struct walkarg *w = vw;
+	struct rtentry *rt = (struct rtentry *)rn;
 	int error = 0, size;
 	struct rt_addrinfo info;
 
@@ -919,7 +919,7 @@ sysctl_dumpentry(rn, vw)
 	}
 	size = rt_msg2(RTM_GET, &info, 0, w);
 	if (w->w_req && w->w_tmem) {
-		register struct rt_msghdr *rtm = (struct rt_msghdr *)w->w_tmem;
+		struct rt_msghdr *rtm = (struct rt_msghdr *)w->w_tmem;
 
 		rtm->rtm_flags = rt->rt_flags;
 		rtm->rtm_use = rt->rt_use;
@@ -936,10 +936,10 @@ sysctl_dumpentry(rn, vw)
 int
 sysctl_iflist(af, w)
 	int	af;
-	register struct	walkarg *w;
+	struct	walkarg *w;
 {
-	register struct ifnet *ifp;
-	register struct ifaddr *ifa;
+	struct ifnet *ifp;
+	struct ifaddr *ifa;
 	struct	rt_addrinfo info;
 	int	len, error = 0;
 
@@ -952,7 +952,7 @@ sysctl_iflist(af, w)
 		len = rt_msg2(RTM_IFINFO, &info, (caddr_t)0, w);
 		ifpaddr = 0;
 		if (w->w_req && w->w_tmem) {
-			register struct if_msghdr *ifm;
+			struct if_msghdr *ifm;
 
 			ifm = (struct if_msghdr *)w->w_tmem;
 			ifm->ifm_index = ifp->if_index;
@@ -973,7 +973,7 @@ sysctl_iflist(af, w)
 			brdaddr = ifa->ifa_dstaddr;
 			len = rt_msg2(RTM_NEWADDR, &info, 0, w);
 			if (w->w_req && w->w_tmem) {
-				register struct ifa_msghdr *ifam;
+				struct ifa_msghdr *ifam;
 
 				ifam = (struct ifa_msghdr *)w->w_tmem;
 				ifam->ifam_index = ifa->ifa_ifp->if_index;
@@ -995,7 +995,7 @@ sysctl_rtsock(SYSCTL_HANDLER_ARGS)
 {
 	int	*name = (int *)arg1;
 	u_int	namelen = arg2;
-	register struct radix_node_head *rnh;
+	struct radix_node_head *rnh;
 	int	i, s, error = EINVAL;
 	u_char  af;
 	struct	walkarg w;
diff --git a/sys/net/sl/if_sl.c b/sys/net/sl/if_sl.c
index 98e9f206ef..b91ea8be11 100644
--- a/sys/net/sl/if_sl.c
+++ b/sys/net/sl/if_sl.c
@@ -32,7 +32,7 @@
  *
  *	@(#)if_sl.c	8.6 (Berkeley) 2/1/94
  * $FreeBSD: src/sys/net/if_sl.c,v 1.84.2.2 2002/02/13 00:43:10 dillon Exp $
- * $DragonFly: src/sys/net/sl/if_sl.c,v 1.5 2003/07/19 21:53:06 dillon Exp $
+ * $DragonFly: src/sys/net/sl/if_sl.c,v 1.6 2003/07/26 20:19:33 rob Exp $
  */
 
 /*
@@ -206,8 +206,8 @@ static void
 slattach(dummy)
 	void *dummy;
 {
-	register struct sl_softc *sc;
-	register int i = 0;
+	struct sl_softc *sc;
+	int i = 0;
 
 	linesw[SLIPDISC] = slipdisc;
 
@@ -235,9 +235,9 @@ slattach(dummy)
 
 static int
 slinit(sc)
-	register struct sl_softc *sc;
+	struct sl_softc *sc;
 {
-	register caddr_t p;
+	caddr_t p;
 
 #ifdef __i386__
 	int s;
@@ -330,7 +330,7 @@ slclose(tp,flag)
 	struct tty *tp;
 	int flag;
 {
-	register struct sl_softc *sc;
+	struct sl_softc *sc;
 	int s;
 
 	ttyflush(tp, FREAD | FWRITE);
@@ -476,13 +476,13 @@ sltioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct thread *p)
 static int
 sloutput(ifp, m, dst, rtp)
 	struct ifnet *ifp;
-	register struct mbuf *m;
+	struct mbuf *m;
 	struct sockaddr *dst;
 	struct rtentry *rtp;
 {
-	register struct sl_softc *sc = &sl_softc[ifp->if_unit];
-	register struct ip *ip;
-	register struct ifqueue *ifq;
+	struct sl_softc *sc = &sl_softc[ifp->if_unit];
+	struct ip *ip;
+	struct ifqueue *ifq;
 	int s;
 
 	/*
@@ -535,15 +535,15 @@ sloutput(ifp, m, dst, rtp)
  */
 static int
 slstart(tp)
-	register struct tty *tp;
+	struct tty *tp;
 {
-	register struct sl_softc *sc = (struct sl_softc *)tp->t_sc;
-	register struct mbuf *m;
-	register u_char *cp;
-	register struct ip *ip;
+	struct sl_softc *sc = (struct sl_softc *)tp->t_sc;
+	struct mbuf *m;
+	u_char *cp;
+	struct ip *ip;
 	int s;
 	u_char bpfbuf[SLTMAX + SLIP_HDRLEN];
-	register int len = 0;
+	int len = 0;
 
 	for (;;) {
 		/*
@@ -594,12 +594,12 @@ slstart(tp)
 			 * and/or the copy should be negligible cost compared
 			 * to the packet transmission time).
 			 */
-			register struct mbuf *m1 = m;
-			register u_char *cp = bpfbuf + SLIP_HDRLEN;
+			struct mbuf *m1 = m;
+			u_char *cp = bpfbuf + SLIP_HDRLEN;
 
 			len = 0;
 			do {
-				register int mlen = m1->m_len;
+				int mlen = m1->m_len;
 
 				bcopy(mtod(m1, caddr_t), cp, mlen);
 				cp += mlen;
@@ -649,7 +649,7 @@ slstart(tp)
 		}
 
 		while (m) {
-			register u_char *ep;
+			u_char *ep;
 
 			cp = mtod(m, u_char *); ep = cp + m->m_len;
 			while (cp < ep) {
@@ -657,7 +657,7 @@ slstart(tp)
 				 * Find out how many bytes in the string we can
 				 * handle without doing something special.
 				 */
-				register u_char *bp = cp;
+				u_char *bp = cp;
 
 				while (cp < ep) {
 					switch (*cp++) {
@@ -722,10 +722,10 @@ slstart(tp)
  */
 static struct mbuf *
 sl_btom(sc, len)
-	register struct sl_softc *sc;
-	register int len;
+	struct sl_softc *sc;
+	int len;
 {
-	register struct mbuf *m;
+	struct mbuf *m;
 
 	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
@@ -765,12 +765,12 @@ sl_btom(sc, len)
  */
 static int
 slinput(c, tp)
-	register int c;
-	register struct tty *tp;
+	int c;
+	struct tty *tp;
 {
-	register struct sl_softc *sc;
-	register struct mbuf *m;
-	register int len;
+	struct sl_softc *sc;
+	struct mbuf *m;
+	int len;
 	int s;
 	u_char chdr[CHDR_LEN];
 
@@ -885,7 +885,7 @@ slinput(c, tp)
 			 * decompression probably moved the buffer
 			 * pointer.  Then, invoke BPF.
 			 */
-			register u_char *hp = sc->sc_buf - SLIP_HDRLEN;
+			u_char *hp = sc->sc_buf - SLIP_HDRLEN;
 
 			hp[SLX_DIR] = SLIPDIR_IN;
 			bcopy(chdr, &hp[SLX_CHDR], CHDR_LEN);
@@ -937,13 +937,13 @@ newpack:
  */
 static int
 slioctl(ifp, cmd, data)
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 	u_long cmd;
 	caddr_t data;
 {
-	register struct ifaddr *ifa = (struct ifaddr *)data;
-	register struct ifreq *ifr = (struct ifreq *)data;
-	register int s, error = 0;
+	struct ifaddr *ifa = (struct ifaddr *)data;
+	struct ifreq *ifr = (struct ifreq *)data;
+	int s, error = 0;
 
 	s = splimp();
 
@@ -1027,7 +1027,7 @@ sl_outfill(chan)
 	void *chan;
 {
 	struct sl_softc *sc = chan;
-	register struct tty *tp = sc->sc_ttyp;
+	struct tty *tp = sc->sc_ttyp;
 	int s;
 
 	if (sc->sc_outfill && tp != NULL) {
diff --git a/sys/net/tun/if_tun.c b/sys/net/tun/if_tun.c
index e643ab0c0b..e5ec7447c5 100644
--- a/sys/net/tun/if_tun.c
+++ b/sys/net/tun/if_tun.c
@@ -14,7 +14,7 @@
  * operation though.
  *
  * $FreeBSD: src/sys/net/if_tun.c,v 1.74.2.8 2002/02/13 00:43:11 dillon Exp $
- * $DragonFly: src/sys/net/tun/if_tun.c,v 1.6 2003/07/21 05:50:43 dillon Exp $
+ * $DragonFly: src/sys/net/tun/if_tun.c,v 1.7 2003/07/26 20:19:33 rob Exp $
  */
 
 #include "opt_inet.h"
@@ -140,7 +140,7 @@ tunopen(dev_t dev, int flag, int mode, struct thread *td)
 {
 	struct ifnet	*ifp;
 	struct tun_softc *tp;
-	register int	error;
+	int	error;
 
 	KKASSERT(td->td_proc);
 	if ((error = suser(td)) != NULL)
@@ -167,7 +167,7 @@ tunopen(dev_t dev, int flag, int mode, struct thread *td)
 static	int
 tunclose(dev_t dev, int foo, int bar, struct thread *td)
 {
-	register int	s;
+	int	s;
 	struct tun_softc *tp;
 	struct ifnet	*ifp;
 	struct mbuf	*m;
@@ -196,7 +196,7 @@ tunclose(dev_t dev, int foo, int bar, struct thread *td)
 	}
 
 	if (ifp->if_flags & IFF_RUNNING) {
-		register struct ifaddr *ifa;
+		struct ifaddr *ifa;
 
 		s = splimp();
 		/* find internet addresses and delete routes */
@@ -220,7 +220,7 @@ tuninit(ifp)
 	struct ifnet *ifp;
 {
 	struct tun_softc *tp = ifp->if_softc;
-	register struct ifaddr *ifa;
+	struct ifaddr *ifa;
 	int error = 0;
 
 	TUNDEBUG("%s%d: tuninit\n", ifp->if_name, ifp->if_unit);
diff --git a/sys/net/zlib.c b/sys/net/zlib.c
index a40078fc35..48d4325aad 100644
--- a/sys/net/zlib.c
+++ b/sys/net/zlib.c
@@ -11,7 +11,7 @@
  * - allow strm->next_out to be NULL, meaning discard the output
  *
  * $FreeBSD: src/sys/net/zlib.c,v 1.10.2.3 2002/03/24 23:12:48 jedgar Exp $
- * $DragonFly: src/sys/net/zlib.c,v 1.2 2003/06/17 04:28:48 dillon Exp $
+ * $DragonFly: src/sys/net/zlib.c,v 1.3 2003/07/26 20:19:34 rob Exp $
  */
 
 /* 
@@ -1275,9 +1275,9 @@ local uInt longest_match(s, cur_match)
     IPos cur_match;                             /* current match */
 {
     unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
+    Bytef *scan = s->window + s->strstart; /* current string */
+    Bytef *match;                       /* matched string */
+    int len;                           /* length of current match */
     int best_len = s->prev_length;              /* best match length so far */
     int nice_match = s->nice_match;             /* stop if match long enough */
     IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
@@ -1292,13 +1292,13 @@ local uInt longest_match(s, cur_match)
     /* Compare two bytes at a time. Note: this is not always beneficial.
      * Try with and without -DUNALIGNED_OK to check.
      */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-    register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan+best_len-1);
+    Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+    ush scan_start = *(ushf*)scan;
+    ush scan_end   = *(ushf*)(scan+best_len-1);
 #else
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len-1];
-    register Byte scan_end   = scan[best_len];
+    Bytef *strend = s->window + s->strstart + MAX_MATCH;
+    Byte scan_end1  = scan[best_len-1];
+    Byte scan_end   = scan[best_len];
 #endif
 
     /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
@@ -1450,8 +1450,8 @@ local void check_match(s, start, match, length)
 local void fill_window(s)
     deflate_state *s;
 {
-    register unsigned n, m;
-    register Posf *p;
+    unsigned n, m;
+    Posf *p;
     unsigned more;    /* Amount of free space at the end of the window. */
     uInt wsize = s->w_size;
 
@@ -2918,7 +2918,7 @@ local unsigned bi_reverse(code, len)
     unsigned code; /* the value to invert */
     int len;       /* its bit length */
 {
-    register unsigned res = 0;
+    unsigned res = 0;
     do {
         res |= code & 1;
         code >>= 1, res <<= 1;
@@ -4217,16 +4217,16 @@ z_streamp zs;           /* for zalloc function */
   uInt f;                       /* i repeats in table every f entries */
   int g;                        /* maximum code length */
   int h;                        /* table level */
-  register uInt i;              /* counter, current code */
-  register uInt j;              /* counter */
-  register int k;               /* number of bits in current code */
+  uInt i;              /* counter, current code */
+  uInt j;              /* counter */
+  int k;               /* number of bits in current code */
   int l;                        /* bits per table (returned in m) */
-  register uIntf *p;            /* pointer into c[], b[], or v[] */
+  uIntf *p;            /* pointer into c[], b[], or v[] */
   inflate_huft *q;              /* points to current table */
   struct inflate_huft_s r;      /* table entry for structure assignment */
   inflate_huft *u[BMAX];        /* table stack */
   uInt v[N_MAX];                /* values in order of bit length */
-  register int w;               /* bits before this table == (l * h) */
+  int w;               /* bits before this table == (l * h) */
   uInt x[BMAX+1];               /* bit offsets, then code stack */
   uIntf *xp;                    /* pointer into x */
   int y;                        /* number of dummy codes added */
@@ -4556,7 +4556,7 @@ z_streamp z;            /* for zfree function */
    list of the tables it made, with the links in a dummy first entry of
    each table. */
 {
-  register inflate_huft *p, *q, *r;
+  inflate_huft *p, *q, *r;
 
   /* Reverse linked list */
   p = Z_NULL;
-- 
2.41.0