M_PREPEND-related cleanups (unregisterifying struct mbuf *s).

14 files changed, 21 insertions, 29 deletions

diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index f01ccc1..37c3d11 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -170,16 +170,15 @@ static struct ng_type typestruct = {
  * Assumes that ifp is actually pointer to arpcom structure.
  */
 int
-ether_output(ifp, m0, dst, rt0)
+ether_output(ifp, m, dst, rt0)
 	register struct ifnet *ifp;
-	struct mbuf *m0;
+	struct mbuf *m;
 	struct sockaddr *dst;
 	struct rtentry *rt0;
 {
 	short type;
 	int s, error = 0, hdrcmplt = 0;
  	u_char esrc[6], edst[6];
-	register struct mbuf *m = m0;
 	register struct rtentry *rt;
 	register struct ether_header *eh;
 	int off, len = m->m_pkthdr.len, loop_copy = 0;
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 0b39131..fc9a75c 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -133,16 +133,15 @@ extern struct ifqueue pkintrq;
  * Assumes that ifp is actually pointer to arpcom structure.
  */
 int
-fddi_output(ifp, m0, dst, rt0)
+fddi_output(ifp, m, dst, rt0)
 	register struct ifnet *ifp;
-	struct mbuf *m0;
+	struct mbuf *m;
 	struct sockaddr *dst;
 	struct rtentry *rt0;
 {
 	u_int16_t type;
 	int s, loop_copy = 0, error = 0, hdrcmplt = 0;
  	u_char esrc[6], edst[6];
-	register struct mbuf *m = m0;
 	register struct rtentry *rt;
 	register struct fddi_header *fh;
 	struct arpcom *ac = (struct arpcom *)ifp;
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index feee4c4..fae8799 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -160,9 +160,9 @@ iso88025_ioctl(struct ifnet *ifp, int command, caddr_t data)
  * ISO88025 encapsulation
  */
 int
-iso88025_output(ifp, m0, dst, rt0)
+iso88025_output(ifp, m, dst, rt0)
 	register struct ifnet *ifp;
-	struct mbuf *m0;
+	struct mbuf *m;
 	struct sockaddr *dst;
 	struct rtentry *rt0;
 {
@@ -173,7 +173,6 @@ iso88025_output(ifp, m0, dst, rt0)
 	register struct sockaddr_dl *sdl = NULL;
         int s, error = 0, rif_len = 0;
  	u_char edst[6];
-	register struct mbuf *m = m0;
 	register struct rtentry *rt;
 	int len = m->m_pkthdr.len, loop_copy = 0;
 	struct arpcom *ac = (struct arpcom *)ifp;
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 5b52c4e..ba36bd3 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -168,7 +168,7 @@ rip_input(m, iphlen)
  */
 int
 rip_output(m, so, dst)
-	register struct mbuf *m;
+	struct mbuf *m;
 	struct socket *so;
 	u_long dst;
 {
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 4b998c7..03e0ab7 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -619,7 +619,7 @@ SYSCTL_PROC(_net_inet_udp, OID_AUTO, getcred, CTLTYPE_OPAQUE|CTLFLAG_RW,
 static int
 udp_output(inp, m, addr, control, p)
 	register struct inpcb *inp;
-	register struct mbuf *m;
+	struct mbuf *m;
 	struct sockaddr *addr;
 	struct mbuf *control;
 	struct proc *p;
diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c
index c22a719..30d8a73 100644
--- a/sys/netinet6/udp6_usrreq.c
+++ b/sys/netinet6/udp6_usrreq.c
@@ -493,7 +493,7 @@ SYSCTL_PROC(_net_inet6_udp6, OID_AUTO, getcred, CTLTYPE_OPAQUE|CTLFLAG_RW,
 int
 udp6_output(in6p, m, addr6, control, p)
 	register struct inpcb *in6p;
-	register struct mbuf *m;
+	struct mbuf *m;
 	struct sockaddr *addr6;
 	struct mbuf *control;
 	struct proc *p;
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index b18b1fb..e674262 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -192,11 +192,11 @@ ipx_output(ipxp, m0)
 	struct ipxpcb *ipxp;
 	struct mbuf *m0;
 {
-	register struct mbuf *m;
 	register struct ipx *ipx;
 	register struct socket *so;
 	register int len = 0;
 	register struct route *ro;
+	struct mbuf *m;
 	struct mbuf *mprev = NULL;
 
 	/*
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index be90100..ccaa848 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -503,10 +503,9 @@ nqsrv_send_eviction(vp, lp, slp, nam, cred)
 	struct ucred *cred;
 {
 	register struct nqhost *lph = &lp->lc_host;
-	register struct mbuf *m;
 	register int siz;
 	struct nqm *lphnext = lp->lc_morehosts;
-	struct mbuf *mreq, *mb, *mb2, *mheadend;
+	struct mbuf *m, *mreq, *mb, *mb2, *mheadend;
 	struct socket *so;
 	struct sockaddr *nam2;
 	struct sockaddr_in *saddr;
@@ -926,14 +925,13 @@ nqnfs_vacated(vp, cred)
 	struct ucred *cred;
 {
 	register caddr_t cp;
-	register struct mbuf *m;
 	register int i;
 	register u_int32_t *tl;
 	register int32_t t2;
 	caddr_t bpos;
 	u_int32_t xid;
 	int error = 0;
-	struct mbuf *mreq, *mb, *mb2, *mheadend;
+	struct mbuf *m, *mreq, *mb, *mb2, *mheadend;
 	struct nfsmount *nmp;
 	struct nfsreq myrep;
 
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index 0bf85c0..41fd303 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -932,12 +932,12 @@ nfs_request(vp, mrest, procnum, procp, cred, mrp, mdp, dposp)
 	struct mbuf **mdp;
 	caddr_t *dposp;
 {
-	register struct mbuf *m, *mrep, *m2;
+	register struct mbuf *mrep, *m2;
 	register struct nfsreq *rep;
 	register u_int32_t *tl;
 	register int i;
 	struct nfsmount *nmp;
-	struct mbuf *md, *mheadend;
+	struct mbuf *m, *md, *mheadend;
 	struct nfsnode *np;
 	char nickv[RPCX_NICKVERF];
 	time_t reqtime, waituntil;
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 7519e68..da18842 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -427,12 +427,11 @@ nfssvc_nfsd(nsd, argp, p)
 	caddr_t argp;
 	struct proc *p;
 {
-	register struct mbuf *m;
 	register int siz;
 	register struct nfssvc_sock *slp;
 	struct nfsd *nfsd = nsd->nsd_nfsd;
 	struct nfsrv_descript *nd = NULL;
-	struct mbuf *mreq;
+	struct mbuf *m, *mreq;
 	int error = 0, cacherep, s, sotype, writes_todo;
 	int procrastinate;
 	u_quad_t cur_usec;
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index 7519e68..da18842 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -427,12 +427,11 @@ nfssvc_nfsd(nsd, argp, p)
 	caddr_t argp;
 	struct proc *p;
 {
-	register struct mbuf *m;
 	register int siz;
 	register struct nfssvc_sock *slp;
 	struct nfsd *nfsd = nsd->nsd_nfsd;
 	struct nfsrv_descript *nd = NULL;
-	struct mbuf *mreq;
+	struct mbuf *m, *mreq;
 	int error = 0, cacherep, s, sotype, writes_todo;
 	int procrastinate;
 	u_quad_t cur_usec;
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 0bf85c0..41fd303 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -932,12 +932,12 @@ nfs_request(vp, mrest, procnum, procp, cred, mrp, mdp, dposp)
 	struct mbuf **mdp;
 	caddr_t *dposp;
 {
-	register struct mbuf *m, *mrep, *m2;
+	register struct mbuf *mrep, *m2;
 	register struct nfsreq *rep;
 	register u_int32_t *tl;
 	register int i;
 	struct nfsmount *nmp;
-	struct mbuf *md, *mheadend;
+	struct mbuf *m, *md, *mheadend;
 	struct nfsnode *np;
 	char nickv[RPCX_NICKVERF];
 	time_t reqtime, waituntil;
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index 0bf85c0..41fd303 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -932,12 +932,12 @@ nfs_request(vp, mrest, procnum, procp, cred, mrp, mdp, dposp)
 	struct mbuf **mdp;
 	caddr_t *dposp;
 {
-	register struct mbuf *m, *mrep, *m2;
+	register struct mbuf *mrep, *m2;
 	register struct nfsreq *rep;
 	register u_int32_t *tl;
 	register int i;
 	struct nfsmount *nmp;
-	struct mbuf *md, *mheadend;
+	struct mbuf *m, *md, *mheadend;
 	struct nfsnode *np;
 	char nickv[RPCX_NICKVERF];
 	time_t reqtime, waituntil;
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index 7519e68..da18842 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -427,12 +427,11 @@ nfssvc_nfsd(nsd, argp, p)
 	caddr_t argp;
 	struct proc *p;
 {
-	register struct mbuf *m;
 	register int siz;
 	register struct nfssvc_sock *slp;
 	struct nfsd *nfsd = nsd->nsd_nfsd;
 	struct nfsrv_descript *nd = NULL;
-	struct mbuf *mreq;
+	struct mbuf *m, *mreq;
 	int error = 0, cacherep, s, sotype, writes_todo;
 	int procrastinate;
 	u_quad_t cur_usec;