? register-remover-netinet.patch
Index: if_atm.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/if_atm.c,v
retrieving revision 1.11
diff -u -r1.11 if_atm.c
--- if_atm.c	21 May 2002 18:52:24 -0000	1.11
+++ if_atm.c	11 Feb 2003 12:43:07 -0000
@@ -77,10 +77,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;
@@ -220,10 +220,10 @@
 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;
Index: if_ether.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/if_ether.c,v
retrieving revision 1.102
diff -u -r1.102 if_ether.c
--- if_ether.c	8 Feb 2003 15:05:15 -0000	1.102
+++ if_ether.c	11 Feb 2003 12:43:07 -0000
@@ -162,11 +162,11 @@
 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) {
@@ -296,14 +296,14 @@
  */
 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 };
@@ -397,11 +397,11 @@
  */
 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;
@@ -499,8 +499,8 @@
 static void
 arpintr()
 {
-	register struct mbuf *m;
-	register struct arphdr *ar;
+	struct mbuf *m;
+	struct arphdr *ar;
 	int s;
 
 	if (!arpinit_done) {
@@ -579,14 +579,14 @@
 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;
@@ -887,10 +887,10 @@
  */
 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)) &&
@@ -911,7 +911,7 @@
 	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;
 
Index: igmp.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/igmp.c,v
retrieving revision 1.40
diff -u -r1.40 igmp.c
--- igmp.c	21 Jan 2003 08:56:03 -0000	1.40
+++ igmp.c	11 Feb 2003 12:43:07 -0000
@@ -124,7 +124,7 @@
 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");
@@ -152,17 +152,17 @@
 
 void
 igmp_input(m, off)
-	register struct mbuf *m;
+	struct mbuf *m;
 	int off;
 {
-	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;
 	
@@ -379,7 +379,7 @@
 void
 igmp_fasttimo()
 {
-	register struct in_multi *inm;
+	struct in_multi *inm;
 	struct in_multistep step;
 	int s;
 
@@ -412,7 +412,7 @@
 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");
Index: in.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/in.c,v
retrieving revision 1.70
diff -u -r1.70 in.c
--- in.c	21 Jan 2003 08:56:03 -0000	1.70
+++ in.c	11 Feb 2003 12:43:07 -0000
@@ -82,8 +82,8 @@
 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)
@@ -106,8 +106,8 @@
 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);
@@ -126,8 +126,8 @@
 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)
@@ -185,12 +185,12 @@
 	struct socket *so;
 	u_long cmd;
 	caddr_t data;
-	register struct ifnet *ifp;
+	struct ifnet *ifp;
 	struct thread *td;
 {
-	register struct ifreq *ifr = (struct ifreq *)data;
-	register struct in_ifaddr *ia = 0, *iap;
-	register struct ifaddr *ifa;
+	struct ifreq *ifr = (struct ifreq *)data;
+	struct in_ifaddr *ia = 0, *iap;
+	struct ifaddr *ifa;
 	struct in_addr dst;
 	struct in_ifaddr *oia;
 	struct in_aliasreq *ifra = (struct in_aliasreq *)data;
@@ -633,8 +633,8 @@
  */
 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)
@@ -652,12 +652,12 @@
  */
 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;
 
@@ -767,7 +767,7 @@
 	struct in_addr in;
         struct ifnet *ifp;
 {
-	register struct ifaddr *ifa;
+	struct ifaddr *ifa;
 	u_long t;
 
 	if (in.s_addr == INADDR_BROADCAST ||
@@ -804,10 +804,10 @@
  */
 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;
@@ -865,7 +865,7 @@
  */
 void
 in_delmulti(inm)
-	register struct in_multi *inm;
+	struct in_multi *inm;
 {
 	struct ifmultiaddr *ifma = inm->inm_ifma;
 	struct in_multi my_inm;
Index: in_cksum.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/in_cksum.c,v
retrieving revision 1.6
diff -u -r1.6 in_cksum.c
--- in_cksum.c	28 Aug 1999 00:49:16 -0000	1.6
+++ in_cksum.c	11 Feb 2003 12:43:07 -0000
@@ -49,12 +49,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 {
Index: in_pcb.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/in_pcb.c,v
retrieving revision 1.116
diff -u -r1.116 in_pcb.c
--- in_pcb.c	30 Jan 2003 05:43:08 -0000	1.116
+++ in_pcb.c	11 Feb 2003 12:43:07 -0000
@@ -149,7 +149,7 @@
 	struct inpcbinfo *pcbinfo;
 	struct thread *td;
 {
-	register struct inpcb *inp;
+	struct inpcb *inp;
 #ifdef IPSEC
 	int error;
 #endif
@@ -185,7 +185,7 @@
 
 int
 in_pcbbind(inp, nam, td)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	struct sockaddr *nam;
 	struct thread *td;
 {
@@ -411,7 +411,7 @@
  */
 int
 in_pcbconnect(inp, nam, td)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	struct sockaddr *nam;
 	struct thread *td;
 {
@@ -466,7 +466,7 @@
  */
 int
 in_pcbconnect_setup(inp, nam, laddrp, lportp, faddrp, fportp, oinpp, td)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	struct sockaddr *nam;
 	in_addr_t *laddrp;
 	u_short *lportp;
@@ -525,7 +525,7 @@
 			    &in_ifaddrhead)->ia_broadaddr)->sin_addr;
 	}
 	if (laddr.s_addr == INADDR_ANY) {
-		register struct route *ro;
+		struct route *ro;
 
 		ia = (struct in_ifaddr *)0;
 		/*
@@ -684,7 +684,7 @@
 	struct inpcbinfo *pcbinfo;
 {
 	int s;
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	struct in_addr addr;
 	in_port_t port;
 
@@ -717,7 +717,7 @@
 	struct inpcbinfo *pcbinfo;
 {
 	int s;
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	struct in_addr addr;
 	in_port_t port;
 
@@ -828,7 +828,7 @@
 in_losing(inp)
 	struct inpcb *inp;
 {
-	register struct rtentry *rt;
+	struct rtentry *rt;
 	struct rt_addrinfo info;
 
 	if ((rt = inp->inp_route.ro_rt)) {
@@ -855,7 +855,7 @@
  */
 struct inpcb *
 in_rtchange(inp, errno)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	int errno;
 {
 	if (inp->inp_route.ro_rt) {
@@ -879,7 +879,7 @@
 	u_int lport_arg;
 	int wild_okay;
 {
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	int matchwild = 3, wildcard;
 	u_short lport = lport_arg;
 
@@ -972,7 +972,7 @@
 	struct ifnet *ifp;
 {
 	struct inpcbhead *head;
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	u_short fport = fport_arg, lport = lport_arg;
 
 	/*
Index: ip_fw.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/ip_fw.c,v
retrieving revision 1.191
diff -u -r1.191 ip_fw.c
--- ip_fw.c	21 Jan 2003 08:56:03 -0000	1.191
+++ ip_fw.c	11 Feb 2003 12:43:08 -0000
@@ -324,7 +324,7 @@
 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;
 
@@ -408,7 +408,7 @@
 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;
 
Index: ip_icmp.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/ip_icmp.c,v
retrieving revision 1.76
diff -u -r1.76 ip_icmp.c
--- ip_icmp.c	21 Jan 2003 08:56:03 -0000	1.76
+++ ip_icmp.c	11 Feb 2003 12:43:08 -0000
@@ -132,10 +132,10 @@
 	n_long dest;
 	struct ifnet *destifp;
 {
-	register struct ip *oip = mtod(n, struct ip *), *nip;
-	register unsigned oiplen = oip->ip_hl << 2;
-	register struct icmp *icp;
-	register struct mbuf *m;
+	struct ip *oip = mtod(n, struct ip *), *nip;
+	unsigned oiplen = oip->ip_hl << 2;
+	struct icmp *icp;
+	struct mbuf *m;
 	unsigned icmplen;
 
 #ifdef ICMPPRINTFS
@@ -238,14 +238,14 @@
  */
 void
 icmp_input(m, off)
-	register struct mbuf *m;
+	struct mbuf *m;
 	int off;
 {
 	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)(int, struct sockaddr *, void *);
 	int code;
@@ -646,7 +646,7 @@
 	ip->ip_ttl = ip_defttl;
 
 	if (optlen > 0) {
-		register u_char *cp;
+		u_char *cp;
 		int opt, cnt;
 		u_int len;
 
@@ -733,13 +733,13 @@
  */
 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->ip_hl << 2;
 	m->m_data += hlen;
Index: ip_input.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/ip_input.c,v
retrieving revision 1.223
diff -u -r1.223 ip_input.c
--- ip_input.c	1 Feb 2003 05:59:51 -0000	1.223
+++ ip_input.c	11 Feb 2003 12:43:08 -0000
@@ -237,8 +237,8 @@
 void
 ip_init()
 {
-	register struct protosw *pr;
-	register int i;
+	struct protosw *pr;
+	int i;
 
 	TAILQ_INIT(&in_ifaddrhead);
 	in_ifaddrhashtbl = hashinit(INADDR_NHASH, M_IFADDR, &in_ifaddrhmask);
@@ -969,7 +969,7 @@
 	u_int32_t *divinfo, u_int16_t *divert_rule)
 {
 	struct ip *ip = mtod(m, struct ip *);
-	register struct mbuf *p, *q, *nq;
+	struct mbuf *p, *q, *nq;
 	struct mbuf *t;
 	int hlen = ip->ip_hl << 2;
 	int i, next;
@@ -1175,7 +1175,7 @@
 	struct ipqhead *fhp;
 	struct ipq *fp;
 {
-	register struct mbuf *q;
+	struct mbuf *q;
 
 	while (fp->ipq_frags) {
 		q = fp->ipq_frags;
@@ -1195,7 +1195,7 @@
 void
 ip_slowtimo()
 {
-	register struct ipq *fp;
+	struct ipq *fp;
 	int s = splnet();
 	int i;
 
@@ -1529,7 +1529,7 @@
 	struct in_addr dst;
 	struct route *rt;
 {
-	register struct sockaddr_in *sin;
+	struct sockaddr_in *sin;
 
 	sin = (struct sockaddr_in *)&rt->ro_dst;
 
@@ -1582,8 +1582,8 @@
 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);
@@ -1652,12 +1652,12 @@
  */
 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->ip_hl << 2) - sizeof (struct ip);
@@ -2012,10 +2012,10 @@
 
 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;
Index: ip_output.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/ip_output.c,v
retrieving revision 1.175
diff -u -r1.175 ip_output.c
--- ip_output.c	30 Jan 2003 05:45:45 -0000	1.175
+++ ip_output.c	11 Feb 2003 12:43:08 -0000
@@ -1257,13 +1257,13 @@
  */
 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);
@@ -1314,7 +1314,7 @@
 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);
@@ -1620,10 +1620,10 @@
 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 */
@@ -2052,7 +2052,7 @@
 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;
@@ -2117,9 +2117,9 @@
  */
 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)
@@ -2138,11 +2138,11 @@
 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);
Index: raw_ip.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/raw_ip.c,v
retrieving revision 1.110
diff -u -r1.110 raw_ip.c
--- raw_ip.c	11 Feb 2003 10:51:56 -0000	1.110
+++ raw_ip.c	11 Feb 2003 12:43:08 -0000
@@ -149,8 +149,8 @@
 	struct mbuf *m;
 	int off;
 {
-	register struct ip *ip = mtod(m, struct ip *);
-	register struct inpcb *inp;
+	struct ip *ip = mtod(m, struct ip *);
+	struct inpcb *inp;
 	struct inpcb *last = 0;
 	struct mbuf *opts = 0;
 	int proto = ip->ip_p;
@@ -270,8 +270,8 @@
 	struct socket *so;
 	u_long dst;
 {
-	register struct ip *ip;
-	register struct inpcb *inp = sotoinpcb(so);
+	struct ip *ip;
+	struct inpcb *inp = sotoinpcb(so);
 	int flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST;
 
 #ifdef MAC
@@ -642,7 +642,7 @@
 	 struct mbuf *control, struct thread *td)
 {
 	struct inpcb *inp = sotoinpcb(so);
-	register u_long dst;
+	u_long dst;
 
 	if (so->so_state & SS_ISCONNECTED) {
 		if (nam) {
Index: tcp_input.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/tcp_input.c,v
retrieving revision 1.188
diff -u -r1.188 tcp_input.c
--- tcp_input.c	2 Feb 2003 22:06:56 -0000	1.188
+++ tcp_input.c	11 Feb 2003 12:43:08 -0000
@@ -164,8 +164,8 @@
 
 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;
 {
@@ -207,7 +207,7 @@
 	 * 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) {
@@ -237,7 +237,7 @@
 	 * 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) {
@@ -302,7 +302,7 @@
 	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);
@@ -328,19 +328,19 @@
 
 void
 tcp_input(m, off0)
-	register struct mbuf *m;
+	struct mbuf *m;
 	int off0;
 {
-	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 = 0;
-	register int thflags;
+	struct tcpcb *tp = 0;
+	int thflags;
 	struct socket *so = 0;
 	int todrop, acked, ourfinisacked, needoutput = 0;
 	u_long tiwin;
@@ -1887,8 +1887,8 @@
 		 * (maxseg^2 / cwnd per packet).
 		 */
 		if (!tcp_do_newreno || SEQ_GEQ(tp->snd_una, tp->snd_recover)) {
-			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);
@@ -2419,7 +2419,7 @@
 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;
@@ -2451,10 +2451,10 @@
  */
 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++;
@@ -2559,9 +2559,9 @@
 	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;
Index: tcp_output.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/tcp_output.c,v
retrieving revision 1.75
diff -u -r1.75 tcp_output.c
--- tcp_output.c	21 Jan 2003 08:56:04 -0000	1.75
+++ tcp_output.c	11 Feb 2003 12:43:08 -0000
@@ -985,7 +985,7 @@
 
 void
 tcp_setpersist(tp)
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 {
 	int t = ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1;
 	int tt;
Index: tcp_subr.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/tcp_subr.c,v
retrieving revision 1.149
diff -u -r1.149 tcp_subr.c
--- tcp_subr.c	21 Jan 2003 08:56:04 -0000	1.149
+++ tcp_subr.c	11 Feb 2003 12:43:08 -0000
@@ -360,12 +360,12 @@
 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;
@@ -556,7 +556,7 @@
 	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 */
@@ -614,7 +614,7 @@
  */
 struct tcpcb *
 tcp_drop(tp, errno)
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 	int errno;
 {
 	struct socket *so = tp->t_inpcb->inp_socket;
@@ -639,15 +639,15 @@
  */
 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;
 
 	/*
@@ -672,7 +672,7 @@
 	 * 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;
Index: tcp_usrreq.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/tcp_usrreq.c,v
retrieving revision 1.84
diff -u -r1.84 tcp_usrreq.c
--- tcp_usrreq.c	24 Oct 2002 02:02:34 -0000	1.84
+++ tcp_usrreq.c	11 Feb 2003 12:43:08 -0000
@@ -841,7 +841,7 @@
  */
 static int
 tcp_connect(tp, nam, td)
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 	struct sockaddr *nam;
 	struct thread *td;
 {
@@ -922,7 +922,7 @@
 #ifdef INET6
 static int
 tcp6_connect(tp, nam, td)
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 	struct sockaddr *nam;
 	struct thread *td;
 {
@@ -1156,7 +1156,7 @@
 	struct socket *so;
 	struct thread *td;
 {
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 	struct inpcb *inp;
 	int error;
 #ifdef INET6
@@ -1208,7 +1208,7 @@
  */
 static struct tcpcb *
 tcp_disconnect(tp)
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 {
 	struct socket *so = tp->t_inpcb->inp_socket;
 
@@ -1238,7 +1238,7 @@
  */
 static struct tcpcb *
 tcp_usrclosed(tp)
-	register struct tcpcb *tp;
+	struct tcpcb *tp;
 {
 
 	switch (tp->t_state) {
Index: udp_usrreq.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/udp_usrreq.c,v
retrieving revision 1.131
diff -u -r1.131 udp_usrreq.c
--- udp_usrreq.c	21 Jan 2003 08:56:04 -0000	1.131
+++ udp_usrreq.c	11 Feb 2003 12:43:09 -0000
@@ -161,13 +161,13 @@
 
 void
 udp_input(m, off)
-	register struct mbuf *m;
+	struct mbuf *m;
 	int off;
 {
 	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;
@@ -490,7 +490,7 @@
  */
 struct inpcb *
 udp_notify(inp, errno)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	int errno;
 {
 	inp->inp_socket->so_error = errno;
@@ -680,14 +680,14 @@
 
 static int
 udp_output(inp, m, addr, control, td)
-	register struct inpcb *inp;
+	struct inpcb *inp;
 	struct mbuf *m;
 	struct sockaddr *addr;
 	struct mbuf *control;
 	struct thread *td;
 {
-	register struct udpiphdr *ui;
-	register int len = m->m_pkthdr.len;
+	struct udpiphdr *ui;
+	int len = m->m_pkthdr.len;
 	struct in_addr faddr, laddr;
 	struct cmsghdr *cm;
 	struct sockaddr_in *sin, src;