From 2256ba6975fea90913c0e9c06490d222f6dd3f9f Mon Sep 17 00:00:00 2001
From: Robert Garrett <rob@dragonflybsd.org>
Date: Sat, 26 Jul 2003 21:00:04 +0000
Subject: [PATCH] Register keyword removal

Approved by: Matt Dillon
---
 sys/net/ipfw/ip_fw.c     |  6 ++---
 sys/netinet/if_atm.c     | 12 ++++-----
 sys/netinet/if_ether.c   | 54 ++++++++++++++++++++--------------------
 sys/netinet/igmp.c       | 26 +++++++++----------
 sys/netinet/in.c         | 34 ++++++++++++-------------
 sys/netinet/in_cksum.c   | 12 ++++-----
 sys/netinet/in_pcb.c     | 22 ++++++++--------
 sys/netinet/ip_icmp.c    | 28 ++++++++++-----------
 sys/netinet/ip_input.c   | 34 ++++++++++++-------------
 sys/netinet/ip_output.c  | 28 ++++++++++-----------
 sys/netinet/tcp_input.c  | 40 ++++++++++++++---------------
 sys/netinet/tcp_output.c | 16 ++++++------
 sys/netinet/tcp_subr.c   | 20 +++++++--------
 sys/netinet/tcp_usrreq.c |  8 +++---
 sys/netinet/udp_usrreq.c | 12 ++++-----
 15 files changed, 176 insertions(+), 176 deletions(-)

diff --git a/sys/net/ipfw/ip_fw.c b/sys/net/ipfw/ip_fw.c
index 10d430c85f..b4f146645b 100644
--- a/sys/net/ipfw/ip_fw.c
+++ b/sys/net/ipfw/ip_fw.c
@@ -14,7 +14,7 @@
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
  * $FreeBSD: src/sys/netinet/ip_fw.c,v 1.131.2.39 2003/01/20 02:23:07 iedowse Exp $
- * $DragonFly: src/sys/net/ipfw/Attic/ip_fw.c,v 1.2 2003/06/17 04:28:51 dillon Exp $
+ * $DragonFly: src/sys/net/ipfw/Attic/ip_fw.c,v 1.3 2003/07/26 21:00:04 rob Exp $
  */
 
 #define        DEB(x)
@@ -323,7 +323,7 @@ is_icmp_query(struct ip *ip)
 static int
 ipopts_match(struct ip *ip, struct ip_fw *f)
 {
-	register u_char *cp;
+	u_char *cp;
 	int opt, optlen, cnt;
 	u_char	opts, nopts, nopts_sve;
 
@@ -380,7 +380,7 @@ ipopts_match(struct ip *ip, struct ip_fw *f)
 static int
 tcpopts_match(struct tcphdr *tcp, struct ip_fw *f)
 {
-	register u_char *cp;
+	u_char *cp;
 	int opt, optlen, cnt;
 	u_char	opts, nopts, nopts_sve;
 
diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c
index 92a6bc0beb..76d9b56136 100644
--- a/sys/netinet/if_atm.c
+++ b/sys/netinet/if_atm.c
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netinet/if_atm.c,v 1.8.2.1 2001/12/20 10:30:18 ru Exp $
- * $DragonFly: src/sys/netinet/if_atm.c,v 1.2 2003/06/17 04:28:51 dillon Exp $
+ * $DragonFly: src/sys/netinet/if_atm.c,v 1.3 2003/07/26 21:00:04 rob Exp $
  */
 
 /*
@@ -78,10 +78,10 @@
 void
 atm_rtrequest(req, rt, info)
 	int req;
-	register struct rtentry *rt;
+	struct rtentry *rt;
 	struct rt_addrinfo *info;
 {
-	register struct sockaddr *gate = rt->rt_gateway;
+	struct sockaddr *gate = rt->rt_gateway;
 	struct atm_pseudoioctl api;
 #ifdef NATM
 	struct sockaddr_in *sin;
@@ -223,10 +223,10 @@ failed:
 int
 atmresolve(rt, m, dst, desten)
 
-register struct rtentry *rt;
+struct rtentry *rt;
 struct mbuf *m;
-register struct sockaddr *dst;
-register struct atm_pseudohdr *desten;	/* OUT */
+struct sockaddr *dst;
+struct atm_pseudohdr *desten;	/* OUT */
 
 {
 	struct sockaddr_dl *sdl;
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index d3df54200f..8eea89e422 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -32,7 +32,7 @@
  *
  *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/netinet/if_ether.c,v 1.64.2.23 2003/04/11 07:23:15 fjoe Exp $
- * $DragonFly: src/sys/netinet/if_ether.c,v 1.2 2003/06/17 04:28:51 dillon Exp $
+ * $DragonFly: src/sys/netinet/if_ether.c,v 1.3 2003/07/26 21:00:04 rob Exp $
  */
 
 /*
@@ -144,12 +144,12 @@ arptimer(ignored_arg)
 	void *ignored_arg;
 {
 	int s = splnet();
-	register struct llinfo_arp *la = LIST_FIRST(&llinfo_arp);
+	struct llinfo_arp *la = LIST_FIRST(&llinfo_arp);
 	struct llinfo_arp *ola;
 
 	timeout(arptimer, (caddr_t)0, arpt_prune * hz);
 	while ((ola = la) != 0) {
-		register struct rtentry *rt = la->la_rt;
+		struct rtentry *rt = la->la_rt;
 		la = LIST_NEXT(la, la_le);
 		if (rt->rt_expire && rt->rt_expire <= time_second)
 			arptfree(ola); /* timer has expired, clear */
@@ -163,11 +163,11 @@ arptimer(ignored_arg)
 static void
 arp_rtrequest(req, rt, info)
 	int req;
-	register struct rtentry *rt;
+	struct rtentry *rt;
 	struct rt_addrinfo *info;
 {
-	register struct sockaddr *gate = rt->rt_gateway;
-	register struct llinfo_arp *la = (struct llinfo_arp *)rt->rt_llinfo;
+	struct sockaddr *gate = rt->rt_gateway;
+	struct llinfo_arp *la = (struct llinfo_arp *)rt->rt_llinfo;
 	static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK};
 
 	if (!arpinit_done) {
@@ -295,14 +295,14 @@ arp_rtrequest(req, rt, info)
  */
 static void
 arprequest(ifp, sip, tip, enaddr)
-	register struct ifnet *ifp;
-	register struct in_addr *sip, *tip;
-	register u_char *enaddr;
+	struct ifnet *ifp;
+	struct in_addr *sip, *tip;
+	u_char *enaddr;
 {
-	register struct mbuf *m;
-	register struct ether_header *eh;
-	register struct arc_header *arh;
-	register struct arphdr *ah;
+	struct mbuf *m;
+	struct ether_header *eh;
+	struct arc_header *arh;
+	struct arphdr *ah;
 	struct sockaddr sa;
 	static u_char	llcx[] = { 0x82, 0x40, LLC_SNAP_LSAP, LLC_SNAP_LSAP,
 				   LLC_UI, 0x00, 0x00, 0x00, 0x08, 0x06 };
@@ -393,11 +393,11 @@ arprequest(ifp, sip, tip, enaddr)
  */
 int
 arpresolve(ifp, rt, m, dst, desten, rt0)
-	register struct ifnet *ifp;
-	register struct rtentry *rt;
+	struct ifnet *ifp;
+	struct rtentry *rt;
 	struct mbuf *m;
-	register struct sockaddr *dst;
-	register u_char *desten;
+	struct sockaddr *dst;
+	u_char *desten;
 	struct rtentry *rt0;
 {
 	struct llinfo_arp *la = 0;
@@ -495,8 +495,8 @@ arpresolve(ifp, rt, m, dst, desten, rt0)
 static void
 arpintr()
 {
-	register struct mbuf *m;
-	register struct arphdr *ar;
+	struct mbuf *m;
+	struct arphdr *ar;
 	int s;
 
 	while (arpintrq.ifq_head) {
@@ -566,14 +566,14 @@ static void
 in_arpinput(m)
 	struct mbuf *m;
 {
-	register struct arphdr *ah;
-	register struct ifnet *ifp = m->m_pkthdr.rcvif;
+	struct arphdr *ah;
+	struct ifnet *ifp = m->m_pkthdr.rcvif;
 	struct ether_header *eh;
 	struct arc_header *arh;
 	struct iso88025_header *th = (struct iso88025_header *)0;
 	struct iso88025_sockaddr_dl_data *trld;
-	register struct llinfo_arp *la = 0;
-	register struct rtentry *rt;
+	struct llinfo_arp *la = 0;
+	struct rtentry *rt;
 	struct ifaddr *ifa;
 	struct in_ifaddr *ia;
 	struct sockaddr_dl *sdl;
@@ -849,10 +849,10 @@ reply:
  */
 static void
 arptfree(la)
-	register struct llinfo_arp *la;
+	struct llinfo_arp *la;
 {
-	register struct rtentry *rt = la->la_rt;
-	register struct sockaddr_dl *sdl;
+	struct rtentry *rt = la->la_rt;
+	struct sockaddr_dl *sdl;
 	if (rt == 0)
 		panic("arptfree");
 	if (rt->rt_refcnt > 0 && (sdl = SDL(rt->rt_gateway)) &&
@@ -873,7 +873,7 @@ arplookup(addr, create, proxy)
 	u_long addr;
 	int create, proxy;
 {
-	register struct rtentry *rt;
+	struct rtentry *rt;
 	static struct sockaddr_inarp sin = {sizeof(sin), AF_INET };
 	const char *why = 0;
 
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 569e3e928b..d466ffe513 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -36,7 +36,7 @@
  *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
  * $FreeBSD: src/sys/netinet/igmp.c,v 1.29.2.2 2003/01/23 21:06:44 sam Exp $
- * $DragonFly: src/sys/netinet/igmp.c,v 1.2 2003/06/17 04:28:51 dillon Exp $
+ * $DragonFly: src/sys/netinet/igmp.c,v 1.3 2003/07/26 21:00:04 rob Exp $
  */
 
 /*
@@ -120,7 +120,7 @@ static struct router_info *
 find_rti(ifp)
 	struct ifnet *ifp;
 {
-        register struct router_info *rti = Head;
+        struct router_info *rti = Head;
 
 #ifdef IGMP_DEBUG
 	printf("[igmp.c, _find_rti] --> entering \n");
@@ -148,17 +148,17 @@ find_rti(ifp)
 
 void
 igmp_input(m, off, proto)
-	register struct mbuf *m;
+	struct mbuf *m;
 	int off, proto;
 {
-	register int iphlen = off;
-	register struct igmp *igmp;
-	register struct ip *ip;
-	register int igmplen;
-	register struct ifnet *ifp = m->m_pkthdr.rcvif;
-	register int minlen;
-	register struct in_multi *inm;
-	register struct in_ifaddr *ia;
+	int iphlen = off;
+	struct igmp *igmp;
+	struct ip *ip;
+	int igmplen;
+	struct ifnet *ifp = m->m_pkthdr.rcvif;
+	int minlen;
+	struct in_multi *inm;
+	struct in_ifaddr *ia;
 	struct in_multistep step;
 	struct router_info *rti;
 	
@@ -375,7 +375,7 @@ igmp_leavegroup(inm)
 void
 igmp_fasttimo()
 {
-	register struct in_multi *inm;
+	struct in_multi *inm;
 	struct in_multistep step;
 	int s;
 
@@ -408,7 +408,7 @@ void
 igmp_slowtimo()
 {
 	int s = splnet();
-	register struct router_info *rti =  Head;
+	struct router_info *rti =  Head;
 
 #ifdef IGMP_DEBUG
 	printf("[igmp.c,_slowtimo] -- > entering \n");
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 676f0f013a..f2c7132860 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -32,7 +32,7 @@
  *
  *	@(#)in.c	8.4 (Berkeley) 1/9/95
  * $FreeBSD: src/sys/netinet/in.c,v 1.44.2.14 2002/11/08 00:45:50 suz Exp $
- * $DragonFly: src/sys/netinet/in.c,v 1.5 2003/07/24 20:46:47 dillon Exp $
+ * $DragonFly: src/sys/netinet/in.c,v 1.6 2003/07/26 21:00:04 rob Exp $
  */
 
 #include "opt_bootp.h"
@@ -85,8 +85,8 @@ int
 in_localaddr(in)
 	struct in_addr in;
 {
-	register u_long i = ntohl(in.s_addr);
-	register struct in_ifaddr *ia;
+	u_long i = ntohl(in.s_addr);
+	struct in_ifaddr *ia;
 
 	if (subnetsarelocal) {
 		TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link)
@@ -109,8 +109,8 @@ int
 in_canforward(in)
 	struct in_addr in;
 {
-	register u_long i = ntohl(in.s_addr);
-	register u_long net;
+	u_long i = ntohl(in.s_addr);
+	u_long net;
 
 	if (IN_EXPERIMENTAL(i) || IN_MULTICAST(i))
 		return (0);
@@ -129,8 +129,8 @@ static void
 in_socktrim(ap)
 struct sockaddr_in *ap;
 {
-    register char *cplim = (char *) &ap->sin_addr;
-    register char *cp = (char *) (&ap->sin_addr + 1);
+    char *cplim = (char *) &ap->sin_addr;
+    char *cp = (char *) (&ap->sin_addr + 1);
 
     ap->sin_len = 0;
     while (--cp >= cplim)
@@ -645,8 +645,8 @@ in_lifaddr_ioctl(so, cmd, data, ifp, td)
  */
 void
 in_ifscrub(ifp, ia)
-	register struct ifnet *ifp;
-	register struct in_ifaddr *ia;
+	struct ifnet *ifp;
+	struct in_ifaddr *ia;
 {
 
 	if ((ia->ia_flags & IFA_ROUTE) == 0)
@@ -664,12 +664,12 @@ in_ifscrub(ifp, ia)
  */
 static int
 in_ifinit(ifp, ia, sin, scrub)
-	register struct ifnet *ifp;
-	register struct in_ifaddr *ia;
+	struct ifnet *ifp;
+	struct in_ifaddr *ia;
 	struct sockaddr_in *sin;
 	int scrub;
 {
-	register u_long i = ntohl(sin->sin_addr.s_addr);
+	u_long i = ntohl(sin->sin_addr.s_addr);
 	struct sockaddr_in oldaddr;
 	int s = splimp(), flags = RTF_UP, error = 0;
 
@@ -779,7 +779,7 @@ in_broadcast(in, ifp)
 	struct in_addr in;
         struct ifnet *ifp;
 {
-	register struct ifaddr *ifa;
+	struct ifaddr *ifa;
 	u_long t;
 
 	if (in.s_addr == INADDR_BROADCAST ||
@@ -816,10 +816,10 @@ in_broadcast(in, ifp)
  */
 struct in_multi *
 in_addmulti(ap, ifp)
-	register struct in_addr *ap;
-	register struct ifnet *ifp;
+	struct in_addr *ap;
+	struct ifnet *ifp;
 {
-	register struct in_multi *inm;
+	struct in_multi *inm;
 	int error;
 	struct sockaddr_in sin;
 	struct ifmultiaddr *ifma;
@@ -877,7 +877,7 @@ in_addmulti(ap, ifp)
  */
 void
 in_delmulti(inm)
-	register struct in_multi *inm;
+	struct in_multi *inm;
 {
 	struct ifmultiaddr *ifma = inm->inm_ifma;
 	struct in_multi my_inm;
diff --git a/sys/netinet/in_cksum.c b/sys/netinet/in_cksum.c
index 024d891a26..f4c305bba1 100644
--- a/sys/netinet/in_cksum.c
+++ b/sys/netinet/in_cksum.c
@@ -32,7 +32,7 @@
  *
  *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/netinet/in_cksum.c,v 1.6 1999/08/28 00:49:16 peter Exp $
- * $DragonFly: src/sys/netinet/in_cksum.c,v 1.2 2003/06/17 04:28:51 dillon Exp $
+ * $DragonFly: src/sys/netinet/in_cksum.c,v 1.3 2003/07/26 21:00:04 rob Exp $
  */
 
 #include <sys/param.h>
@@ -50,12 +50,12 @@
 
 int
 in_cksum(m, len)
-	register struct mbuf *m;
-	register int len;
+	struct mbuf *m;
+	int len;
 {
-	register u_short *w;
-	register int sum = 0;
-	register int mlen = 0;
+	u_short *w;
+	int sum = 0;
+	int mlen = 0;
 	int byte_swapped = 0;
 
 	union {
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 55320a0503..c9af6c027b 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -32,7 +32,7 @@
  *
  *	@(#)in_pcb.c	8.4 (Berkeley) 5/24/95
  * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.59.2.26 2003/01/24 05:11:33 sam Exp $
- * $DragonFly: src/sys/netinet/in_pcb.c,v 1.5 2003/07/06 21:23:52 dillon Exp $
+ * $DragonFly: src/sys/netinet/in_pcb.c,v 1.6 2003/07/26 21:00:04 rob Exp $
  */
 
 #include "opt_ipsec.h"
@@ -383,12 +383,12 @@ in_pcbbind(struct inpcb *inp, struct sockaddr *nam, struct thread *td)
 
 int
 in_pcbladdr(inp, nam, plocal_sin)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	struct sockaddr *nam;
 	struct sockaddr_in **plocal_sin;
 {
 	struct in_ifaddr *ia;
-	register struct sockaddr_in *sin = (struct sockaddr_in *)nam;
+	struct sockaddr_in *sin = (struct sockaddr_in *)nam;
 
 	if (nam->sa_len != sizeof (*sin))
 		return (EINVAL);
@@ -411,7 +411,7 @@ in_pcbladdr(inp, nam, plocal_sin)
 		    sin->sin_addr = satosin(&TAILQ_FIRST(&in_ifaddrhead)->ia_broadaddr)->sin_addr;
 	}
 	if (inp->inp_laddr.s_addr == INADDR_ANY) {
-		register struct route *ro;
+		struct route *ro;
 
 		ia = (struct in_ifaddr *)0;
 		/*
@@ -592,8 +592,8 @@ in_setsockaddr(so, nam)
 	struct sockaddr **nam;
 {
 	int s;
-	register struct inpcb *inp;
-	register struct sockaddr_in *sin;
+	struct inpcb *inp;
+	struct sockaddr_in *sin;
 
 	/*
 	 * Do the malloc first in case it blocks.
@@ -625,7 +625,7 @@ in_setpeeraddr(so, nam)
 {
 	int s;
 	struct inpcb *inp;
-	register struct sockaddr_in *sin;
+	struct sockaddr_in *sin;
 
 	/*
 	 * Do the malloc first in case it blocks.
@@ -722,7 +722,7 @@ void
 in_losing(inp)
 	struct inpcb *inp;
 {
-	register struct rtentry *rt;
+	struct rtentry *rt;
 	struct rt_addrinfo info;
 
 	if ((rt = inp->inp_route.ro_rt)) {
@@ -749,7 +749,7 @@ in_losing(inp)
  */
 void
 in_rtchange(inp, errno)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	int errno;
 {
 	if (inp->inp_route.ro_rt) {
@@ -772,7 +772,7 @@ in_pcblookup_local(pcbinfo, laddr, lport_arg, wild_okay)
 	u_int lport_arg;
 	int wild_okay;
 {
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	int matchwild = 3, wildcard;
 	u_short lport = lport_arg;
 
@@ -865,7 +865,7 @@ in_pcblookup_hash(pcbinfo, faddr, fport_arg, laddr, lport_arg, wildcard,
 	struct ifnet *ifp;
 {
 	struct inpcbhead *head;
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	u_short fport = fport_arg, lport = lport_arg;
 
 	/*
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index bf510e6395..4cba1bc6fe 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -32,7 +32,7 @@
  *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.39.2.19 2003/01/24 05:11:34 sam Exp $
- * $DragonFly: src/sys/netinet/ip_icmp.c,v 1.2 2003/06/17 04:28:51 dillon Exp $
+ * $DragonFly: src/sys/netinet/ip_icmp.c,v 1.3 2003/07/26 21:00:04 rob Exp $
  */
 
 #include "opt_ipsec.h"
@@ -144,10 +144,10 @@ icmp_error(n, type, code, dest, destifp)
 	n_long dest;
 	struct ifnet *destifp;
 {
-	register struct ip *oip = mtod(n, struct ip *), *nip;
-	register unsigned oiplen = IP_VHL_HL(oip->ip_vhl) << 2;
-	register struct icmp *icp;
-	register struct mbuf *m;
+	struct ip *oip = mtod(n, struct ip *), *nip;
+	unsigned oiplen = IP_VHL_HL(oip->ip_vhl) << 2;
+	struct icmp *icp;
+	struct mbuf *m;
 	unsigned icmplen;
 
 #ifdef ICMPPRINTFS
@@ -246,14 +246,14 @@ static struct sockaddr_in icmpgw = { sizeof (struct sockaddr_in), AF_INET };
  */
 void
 icmp_input(m, off, proto)
-	register struct mbuf *m;
+	struct mbuf *m;
 	int off, proto;
 {
 	int hlen = off;
-	register struct icmp *icp;
-	register struct ip *ip = mtod(m, struct ip *);
+	struct icmp *icp;
+	struct ip *ip = mtod(m, struct ip *);
 	int icmplen = ip->ip_len;
-	register int i;
+	int i;
 	struct in_ifaddr *ia;
 	void (*ctlfunc) __P((int, struct sockaddr *, void *));
 	int code;
@@ -658,7 +658,7 @@ match:
 	ip->ip_ttl = ip_defttl;
 
 	if (optlen > 0) {
-		register u_char *cp;
+		u_char *cp;
 		int opt, cnt;
 		u_int len;
 
@@ -744,13 +744,13 @@ done:
  */
 static void
 icmp_send(m, opts, rt)
-	register struct mbuf *m;
+	struct mbuf *m;
 	struct mbuf *opts;
 	struct route *rt;
 {
-	register struct ip *ip = mtod(m, struct ip *);
-	register int hlen;
-	register struct icmp *icp;
+	struct ip *ip = mtod(m, struct ip *);
+	int hlen;
+	struct icmp *icp;
 
 	hlen = IP_VHL_HL(ip->ip_vhl) << 2;
 	m->m_data += hlen;
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 14a19a8f81..57a362ca1e 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -32,7 +32,7 @@
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/netinet/ip_input.c,v 1.130.2.52 2003/03/07 07:01:28 silby Exp $
- * $DragonFly: src/sys/netinet/ip_input.c,v 1.2 2003/06/17 04:28:51 dillon Exp $
+ * $DragonFly: src/sys/netinet/ip_input.c,v 1.3 2003/07/26 21:00:04 rob Exp $
  */
 
 #define	_IP_VHL
@@ -246,8 +246,8 @@ static void	ipintr(void);
 void
 ip_init()
 {
-	register struct ipprotosw *pr;
-	register int i;
+	struct ipprotosw *pr;
+	int i;
 
 	TAILQ_INIT(&in_ifaddrhead);
 	in_ifaddrhashtbl = hashinit(INADDR_NHASH, M_IFADDR, &in_ifaddrhmask);
@@ -966,7 +966,7 @@ ip_reass(struct mbuf *m, struct ipq *fp, struct ipq *where,
 	u_int32_t *divinfo, u_int16_t *divert_rule)
 {
 	struct ip *ip = mtod(m, struct ip *);
-	register struct mbuf *p = 0, *q, *nq;
+	struct mbuf *p = 0, *q, *nq;
 	struct mbuf *t;
 	int hlen = IP_VHL_HL(ip->ip_vhl) << 2;
 	int i, next;
@@ -1159,7 +1159,7 @@ inserted:
 	m->m_data -= (IP_VHL_HL(ip->ip_vhl) << 2);
 	/* some debugging cruft by sklower, below, will go away soon */
 	if (m->m_flags & M_PKTHDR) { /* XXX this should be done elsewhere */
-		register int plen = 0;
+		int plen = 0;
 		for (t = m; t; t = t->m_next)
 			plen += t->m_len;
 		m->m_pkthdr.len = plen;
@@ -1188,7 +1188,7 @@ static void
 ip_freef(fp)
 	struct ipq *fp;
 {
-	register struct mbuf *q;
+	struct mbuf *q;
 
 	while (fp->ipq_frags) {
 		q = fp->ipq_frags;
@@ -1208,7 +1208,7 @@ ip_freef(fp)
 void
 ip_slowtimo()
 {
-	register struct ipq *fp;
+	struct ipq *fp;
 	int s = splnet();
 	int i;
 
@@ -1543,7 +1543,7 @@ ip_rtaddr(dst, rt)
 	struct in_addr dst;
 	struct route *rt;
 {
-	register struct sockaddr_in *sin;
+	struct sockaddr_in *sin;
 
 	sin = (struct sockaddr_in *)&rt->ro_dst;
 
@@ -1595,8 +1595,8 @@ save_rte(option, dst)
 struct mbuf *
 ip_srcroute()
 {
-	register struct in_addr *p, *q;
-	register struct mbuf *m;
+	struct in_addr *p, *q;
+	struct mbuf *m;
 
 	if (ip_nhops == 0)
 		return ((struct mbuf *)0);
@@ -1665,12 +1665,12 @@ ip_srcroute()
  */
 void
 ip_stripoptions(m, mopt)
-	register struct mbuf *m;
+	struct mbuf *m;
 	struct mbuf *mopt;
 {
-	register int i;
+	int i;
 	struct ip *ip = mtod(m, struct ip *);
-	register caddr_t opts;
+	caddr_t opts;
 	int olen;
 
 	olen = (IP_VHL_HL(ip->ip_vhl) << 2) - sizeof (struct ip);
@@ -2031,10 +2031,10 @@ ip_forward(struct mbuf *m, int srcrt, struct sockaddr_in *next_hop)
 
 void
 ip_savecontrol(inp, mp, ip, m)
-	register struct inpcb *inp;
-	register struct mbuf **mp;
-	register struct ip *ip;
-	register struct mbuf *m;
+	struct inpcb *inp;
+	struct mbuf **mp;
+	struct ip *ip;
+	struct mbuf *m;
 {
 	if (inp->inp_socket->so_options & SO_TIMESTAMP) {
 		struct timeval tv;
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index cc83352fa0..fbb9b0abbb 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -32,7 +32,7 @@
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/netinet/ip_output.c,v 1.99.2.37 2003/04/15 06:44:45 silby Exp $
- * $DragonFly: src/sys/netinet/ip_output.c,v 1.4 2003/07/21 07:57:48 dillon Exp $
+ * $DragonFly: src/sys/netinet/ip_output.c,v 1.5 2003/07/26 21:00:04 rob Exp $
  */
 
 #define _IP_VHL
@@ -1229,13 +1229,13 @@ in_delayed_cksum(struct mbuf *m)
  */
 static struct mbuf *
 ip_insertoptions(m, opt, phlen)
-	register struct mbuf *m;
+	struct mbuf *m;
 	struct mbuf *opt;
 	int *phlen;
 {
-	register struct ipoption *p = mtod(opt, struct ipoption *);
+	struct ipoption *p = mtod(opt, struct ipoption *);
 	struct mbuf *n;
-	register struct ip *ip = mtod(m, struct ip *);
+	struct ip *ip = mtod(m, struct ip *);
 	unsigned optlen;
 
 	optlen = opt->m_len - sizeof(p->ipopt_dst);
@@ -1282,7 +1282,7 @@ int
 ip_optcopy(ip, jp)
 	struct ip *ip, *jp;
 {
-	register u_char *cp, *dp;
+	u_char *cp, *dp;
 	int opt, optlen, cnt;
 
 	cp = (u_char *)(ip + 1);
@@ -1588,10 +1588,10 @@ static int
 ip_pcbopts(optname, pcbopt, m)
 	int optname;
 	struct mbuf **pcbopt;
-	register struct mbuf *m;
+	struct mbuf *m;
 {
-	register int cnt, optlen;
-	register u_char *cp;
+	int cnt, optlen;
+	u_char *cp;
 	u_char opt;
 
 	/* turn off any old options */
@@ -2020,7 +2020,7 @@ ip_setmoptions(sopt, imop)
 static int
 ip_getmoptions(sopt, imo)
 	struct sockopt *sopt;
-	register struct ip_moptions *imo;
+	struct ip_moptions *imo;
 {
 	struct in_addr addr;
 	struct in_ifaddr *ia;
@@ -2085,9 +2085,9 @@ ip_getmoptions(sopt, imo)
  */
 void
 ip_freemoptions(imo)
-	register struct ip_moptions *imo;
+	struct ip_moptions *imo;
 {
-	register int i;
+	int i;
 
 	if (imo != NULL) {
 		for (i = 0; i < imo->imo_num_memberships; ++i)
@@ -2106,11 +2106,11 @@ ip_freemoptions(imo)
 static void
 ip_mloopback(ifp, m, dst, hlen)
 	struct ifnet *ifp;
-	register struct mbuf *m;
-	register struct sockaddr_in *dst;
+	struct mbuf *m;
+	struct sockaddr_in *dst;
 	int hlen;
 {
-	register struct ip *ip;
+	struct ip *ip;
 	struct mbuf *copym;
 
 	copym = m_copy(m, 0, M_COPYALL);
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 31f4cca7bc..67829fcbbb 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -32,7 +32,7 @@
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
  * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.107.2.38 2003/05/21 04:46:41 cjc Exp $
- * $DragonFly: src/sys/netinet/tcp_input.c,v 1.5 2003/07/24 23:33:33 hsu Exp $
+ * $DragonFly: src/sys/netinet/tcp_input.c,v 1.6 2003/07/26 21:00:04 rob Exp $
  */
 
 #include "opt_ipfw.h"		/* for ipfw_fwd		*/
@@ -173,8 +173,8 @@ do { \
 
 static int
 tcp_reass(tp, th, tlenp, m)
-	register struct tcpcb *tp;
-	register struct tcphdr *th;
+	struct tcpcb *tp;
+	struct tcphdr *th;
 	int *tlenp;
 	struct mbuf *m;
 {
@@ -216,7 +216,7 @@ tcp_reass(tp, th, tlenp, m)
 	 * segment.  If it provides all of our data, drop us.
 	 */
 	if (p != NULL) {
-		register int i;
+		int i;
 		/* conversion to int (in i) handles seq wraparound */
 		i = p->tqe_th->th_seq + p->tqe_len - th->th_seq;
 		if (i > 0) {
@@ -246,7 +246,7 @@ tcp_reass(tp, th, tlenp, m)
 	 * if they are completely covered, dequeue them.
 	 */
 	while (q) {
-		register int i = (th->th_seq + *tlenp) - q->tqe_th->th_seq;
+		int i = (th->th_seq + *tlenp) - q->tqe_th->th_seq;
 		if (i <= 0)
 			break;
 		if (i < q->tqe_len) {
@@ -311,7 +311,7 @@ tcp6_input(mp, offp, proto)
 	struct mbuf **mp;
 	int *offp, proto;
 {
-	register struct mbuf *m = *mp;
+	struct mbuf *m = *mp;
 	struct in6_ifaddr *ia6;
 
 	IP6_EXTHDR_CHECK(m, *offp, sizeof(struct tcphdr), IPPROTO_DONE);
@@ -337,19 +337,19 @@ tcp6_input(mp, offp, proto)
 
 void
 tcp_input(m, off0, proto)
-	register struct mbuf *m;
+	struct mbuf *m;
 	int off0, proto;
 {
-	register struct tcphdr *th;
-	register struct ip *ip = NULL;
-	register struct ipovly *ipov;
-	register struct inpcb *inp = NULL;
+	struct tcphdr *th;
+	struct ip *ip = NULL;
+	struct ipovly *ipov;
+	struct inpcb *inp = NULL;
 	u_char *optp = NULL;
 	int optlen = 0;
 	int len, tlen, off;
 	int drop_hdrlen;
-	register struct tcpcb *tp = NULL;
-	register int thflags;
+	struct tcpcb *tp = NULL;
+	int thflags;
 	struct socket *so = 0;
 	int todrop, acked, ourfinisacked, needoutput = 0;
 	u_long tiwin;
@@ -1872,8 +1872,8 @@ process_ACK:
 		 * (maxseg^2 / cwnd per packet).
 		 */
 		if (!tcp_do_newreno || !IN_FASTRECOVERY(tp)) {
-			register u_int cw = tp->snd_cwnd;
-			register u_int incr = tp->t_maxseg;
+			u_int cw = tp->snd_cwnd;
+			u_int incr = tp->t_maxseg;
 			if (cw > tp->snd_ssthresh)
 				incr = incr * incr / cw;
 			tp->snd_cwnd = min(cw+incr, TCP_MAXWIN<<tp->snd_scale);
@@ -2393,7 +2393,7 @@ static void
 tcp_pulloutofband(so, th, m, off)
 	struct socket *so;
 	struct tcphdr *th;
-	register struct mbuf *m;
+	struct mbuf *m;
 	int off;		/* delayed to be droped hdrlen */
 {
 	int cnt = off + th->th_urp - 1;
@@ -2425,10 +2425,10 @@ tcp_pulloutofband(so, th, m, off)
  */
 static void
 tcp_xmit_timer(tp, rtt)
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 	int rtt;
 {
-	register int delta;
+	int delta;
 
 	tcpstat.tcps_rttupdated++;
 	tp->t_rttupdated++;
@@ -2533,9 +2533,9 @@ tcp_mss(tp, offer)
 	struct tcpcb *tp;
 	int offer;
 {
-	register struct rtentry *rt;
+	struct rtentry *rt;
 	struct ifnet *ifp;
-	register int rtt, mss;
+	int rtt, mss;
 	u_long bufsize;
 	struct inpcb *inp = tp->t_inpcb;
 	struct socket *so;
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 9092c5f626..ac379d8cbd 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -32,7 +32,7 @@
  *
  *	@(#)tcp_output.c	8.4 (Berkeley) 5/24/95
  * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.39.2.20 2003/01/29 22:45:36 hsu Exp $
- * $DragonFly: src/sys/netinet/tcp_output.c,v 1.2 2003/06/17 04:28:51 dillon Exp $
+ * $DragonFly: src/sys/netinet/tcp_output.c,v 1.3 2003/07/26 21:00:04 rob Exp $
  */
 
 #include "opt_inet6.h"
@@ -108,18 +108,18 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, newreno, CTLFLAG_RW, &tcp_do_newreno,
  */
 int
 tcp_output(tp)
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 {
-	register struct socket *so = tp->t_inpcb->inp_socket;
-	register long len, win;
+	struct socket *so = tp->t_inpcb->inp_socket;
+	long len, win;
 	int off, flags, error;
-	register struct mbuf *m;
+	struct mbuf *m;
 	struct ip *ip = NULL;
-	register struct ipovly *ipov = NULL;
+	struct ipovly *ipov = NULL;
 #ifdef INET6
 	struct ip6_hdr *ip6 = NULL;
 #endif /* INET6 */
-	register struct tcphdr *th;
+	struct tcphdr *th;
 	u_char opt[TCP_MAXOLEN];
 	unsigned ipoptlen, optlen, hdrlen;
 	int idle, sendalot;
@@ -987,7 +987,7 @@ out:
 
 void
 tcp_setpersist(tp)
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 {
 	int t = ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1;
 	int tt;
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index b3e9d72981..3fb62ee476 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -32,7 +32,7 @@
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
  * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.73.2.31 2003/01/24 05:11:34 sam Exp $
- * $DragonFly: src/sys/netinet/tcp_subr.c,v 1.6 2003/07/23 02:30:22 dillon Exp $
+ * $DragonFly: src/sys/netinet/tcp_subr.c,v 1.7 2003/07/26 21:00:04 rob Exp $
  */
 
 #include "opt_compat.h"
@@ -358,12 +358,12 @@ void
 tcp_respond(tp, ipgen, th, m, ack, seq, flags)
 	struct tcpcb *tp;
 	void *ipgen;
-	register struct tcphdr *th;
-	register struct mbuf *m;
+	struct tcphdr *th;
+	struct mbuf *m;
 	tcp_seq ack, seq;
 	int flags;
 {
-	register int tlen;
+	int tlen;
 	int win = 0;
 	struct route *ro = 0;
 	struct route sro;
@@ -537,7 +537,7 @@ tcp_newtcpcb(inp)
 	struct inpcb *inp;
 {
 	struct inp_tp *it;
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 #ifdef INET6
 	int isipv6 = (inp->inp_vflag & INP_IPV6) != 0;
 #endif /* INET6 */
@@ -595,7 +595,7 @@ tcp_newtcpcb(inp)
  */
 struct tcpcb *
 tcp_drop(tp, errno)
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 	int errno;
 {
 	struct socket *so = tp->t_inpcb->inp_socket;
@@ -620,15 +620,15 @@ tcp_drop(tp, errno)
  */
 struct tcpcb *
 tcp_close(tp)
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 {
-	register struct tseg_qent *q;
+	struct tseg_qent *q;
 	struct inpcb *inp = tp->t_inpcb;
 	struct socket *so = inp->inp_socket;
 #ifdef INET6
 	int isipv6 = (inp->inp_vflag & INP_IPV6) != 0;
 #endif /* INET6 */
-	register struct rtentry *rt;
+	struct rtentry *rt;
 	int dosavessthresh;
 
 	/*
@@ -653,7 +653,7 @@ tcp_close(tp)
 	 * update anything that the user "locked".
 	 */
 	if (tp->t_rttupdated >= 16) {
-		register u_long i = 0;
+		u_long i = 0;
 #ifdef INET6
 		if (isipv6) {
 			struct sockaddr_in6 *sin6;
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index d99d77fae2..6224db67f6 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -32,7 +32,7 @@
  *
  *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
  * $FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.51.2.17 2002/10/11 11:46:44 ume Exp $
- * $DragonFly: src/sys/netinet/tcp_usrreq.c,v 1.3 2003/06/25 03:56:04 dillon Exp $
+ * $DragonFly: src/sys/netinet/tcp_usrreq.c,v 1.4 2003/07/26 21:00:04 rob Exp $
  */
 
 #include "opt_ipsec.h"
@@ -1005,7 +1005,7 @@ SYSCTL_INT(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace, CTLFLAG_RW,
 static int
 tcp_attach(struct socket *so, struct thread *td)
 {
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 	struct inpcb *inp;
 	int error;
 #ifdef INET6
@@ -1057,7 +1057,7 @@ tcp_attach(struct socket *so, struct thread *td)
  */
 static struct tcpcb *
 tcp_disconnect(tp)
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 {
 	struct socket *so = tp->t_inpcb->inp_socket;
 
@@ -1087,7 +1087,7 @@ tcp_disconnect(tp)
  */
 static struct tcpcb *
 tcp_usrclosed(tp)
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 {
 
 	switch (tp->t_state) {
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 77ae8d4d5d..4b67fb5c6d 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -32,7 +32,7 @@
  *
  *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
  * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.64.2.18 2003/01/24 05:11:34 sam Exp $
- * $DragonFly: src/sys/netinet/udp_usrreq.c,v 1.4 2003/06/25 03:56:04 dillon Exp $
+ * $DragonFly: src/sys/netinet/udp_usrreq.c,v 1.5 2003/07/26 21:00:04 rob Exp $
  */
 
 #include "opt_ipsec.h"
@@ -154,13 +154,13 @@ udp_init()
 
 void
 udp_input(m, off, proto)
-	register struct mbuf *m;
+	struct mbuf *m;
 	int off, proto;
 {
 	int iphlen = off;
-	register struct ip *ip;
-	register struct udphdr *uh;
-	register struct inpcb *inp;
+	struct ip *ip;
+	struct udphdr *uh;
+	struct inpcb *inp;
 	struct mbuf *opts = 0;
 	int len;
 	struct ip save_ip;
@@ -513,7 +513,7 @@ udp_append(last, ip, n, off)
  */
 void
 udp_notify(inp, errno)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	int errno;
 {
 	inp->inp_socket->so_error = errno;
-- 
2.41.0