Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deprecate the "m_act" alias of "m_nextpkt" (m_act is a historical

Browse Source 
name), and just use m_nextpkt everywhere.
This commit is contained in:
thorpej 2001-10-18 20:17:24 +00:00
parent 9de5bfcf8f
commit e45efd967f
17 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/kern/uipc_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uipc_usrreq.c,v 1.51 2001/06/14 20:32:47 thorpej Exp $ */
/* $NetBSD: uipc_usrreq.c,v 1.52 2001/10/18 20:17:24 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -1256,7 +1256,7 @@ unp_scan(m0, op, discard)
break; /* XXX, but saves time */
}
}
m0 = m0->m_act;
m0 = m0->m_nextpkt;
}
}

8
sys/netccitt/hd_input.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hd_input.c,v 1.15 2001/04/13 23:30:19 thorpej Exp $ */
/* $NetBSD: hd_input.c,v 1.16 2001/10/18 20:17:26 thorpej Exp $ */
/*
* Copyright (c) 1984 University of British Columbia.
@ -394,14 +394,14 @@ process_iframe(hdp, fbuf, frame)
fbuf->m_pkthdr.len -= HDHEADERLN;
fbuf->m_pkthdr.rcvif = (struct ifnet *) hdp->hd_pkp;
#ifdef BSD4_3
fbuf->m_act = 0;/* probably not necessary */
fbuf->m_nextpkt = 0;/* probably not necessary */
#else
{
struct mbuf *m;
for (m = fbuf; m->m_next; m = m->m_next)
m->m_act = (struct mbuf *) 0;
m->m_act = (struct mbuf *) 1;
m->m_nextpkt = (struct mbuf *) 0;
m->m_nextpkt = (struct mbuf *) 1;
}
#endif
pk_input(fbuf);

12
sys/netccitt/hd_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hd_subr.c,v 1.13 2001/04/13 23:30:19 thorpej Exp $ */
/* $NetBSD: hd_subr.c,v 1.14 2001/10/18 20:17:26 thorpej Exp $ */
/*
* Copyright (c) 1984 University of British Columbia.
@ -263,7 +263,7 @@ hd_writeinternal(hdp, frametype, pf)
/* Assume a response - address structure for DTE */
frame->address = ADDRESS_A;
buf->m_len = 2;
buf->m_act = buf->m_next = NULL;
buf->m_nextpkt = buf->m_next = NULL;
switch (frametype) {
case RR:
@ -335,9 +335,9 @@ hd_remove(q)
m = q->head;
if (m) {
if ((q->head = m->m_act) == NULL)
if ((q->head = m->m_nextpkt) == NULL)
q->tail = NULL;
m->m_act = 0;
m->m_nextpkt = 0;
}
return (m);
}
@ -348,11 +348,11 @@ hd_append(q, m)
struct mbuf *m;
{
m->m_act = NULL;
m->m_nextpkt = NULL;
if (q->tail == NULL)
q->head = m;
else
q->tail->m_act = m;
q->tail->m_nextpkt = m;
q->tail = m;
}

4
sys/netccitt/if_x25subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_x25subr.c,v 1.25 2001/06/14 05:44:26 itojun Exp $ */
/* $NetBSD: if_x25subr.c,v 1.26 2001/10/18 20:17:27 thorpej Exp $ */
/*
* Copyright (c) 1990, 1993
@ -767,7 +767,7 @@ pk_rtattach(so, m0)
((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
#define transfer_sockbuf(s, f, l) \
while ((m = (s)->sb_mb) != NULL) \
{(s)->sb_mb = m->m_act; m->m_act = 0; sbfree((s), m); f;}
{(s)->sb_mb = m->m_nextpkt; m->m_nextpkt = 0; sbfree((s), m); f;}
if (rt)
rt->rt_refcnt--;

4
sys/netccitt/llc_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: llc_subr.c,v 1.13 2001/08/20 12:00:53 wiz Exp $ */
/* $NetBSD: llc_subr.c,v 1.14 2001/10/18 20:17:27 thorpej Exp $ */
/*
* Copyright (c) 1990, 1991, 1992
@ -2343,7 +2343,7 @@ llc_dellink(linkp)
/* drop queued packets */
for (m = linkp->llcl_writeqh; m;) {
n = m->m_act;
n = m->m_nextpkt;
m_freem(m);
m = n;
}

4
sys/netccitt/llc_var.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: llc_var.h,v 1.11 2000/03/30 13:53:35 augustss Exp $ */
/* $NetBSD: llc_var.h,v 1.12 2001/10/18 20:17:28 thorpej Exp $ */
/*
* Copyright (c) 1990, 1991, 1992
@ -389,7 +389,7 @@ struct sdl_hdr {
MGETHDR (_m,M_DONTWAIT,MT_HEADER); \
if (_m != NULL) { \
_m->m_pkthdr.len = _m->m_len = LLC_UFRAMELEN; \
_m->m_next = _m->m_act = NULL; \
_m->m_next = _m->m_nextpkt = NULL; \
bzero(mtod(_m,caddr_t),LLC_UFRAMELEN); \
} else return; \
} \

4
sys/netccitt/pk_output.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pk_output.c,v 1.13 2000/03/30 13:53:36 augustss Exp $ */
/* $NetBSD: pk_output.c,v 1.14 2001/10/18 20:17:28 thorpej Exp $ */
/*
* Copyright (c) 1984 University of British Columbia.
@ -211,7 +211,7 @@ nextpk(lcp)
return (NULL);
sb->sb_mb = m->m_nextpkt;
m->m_act = 0;
m->m_nextpkt = 0;
for (n = m; n; n = n->m_next)
sbfree(sb, n);
}

14
sys/netccitt/pk_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pk_subr.c,v 1.21 2001/06/19 07:37:16 jdolecek Exp $ */
/* $NetBSD: pk_subr.c,v 1.22 2001/10/18 20:17:28 thorpej Exp $ */
/*
* Copyright (c) 1984 University of British Columbia.
@ -211,7 +211,7 @@ pk_template(lcn, type)
MGETHDR(m, M_DONTWAIT, MT_HEADER);
if (m == 0)
panic("pk_template");
m->m_act = 0;
m->m_nextpkt = 0;
/*
* Efficiency hack: leave a four byte gap at the beginning
@ -1175,7 +1175,7 @@ pk_fragment(lcp, m0, qbit, mbit, wait)
if ((m->m_flags & M_PKTHDR) == 0)
panic("pk_fragment");
totlen = m->m_pkthdr.len;
m->m_act = 0;
m->m_nextpkt = 0;
sb = lcp->lcd_so ? &lcp->lcd_so->so_snd : &lcp->lcd_sb;
do {
if (totlen > psize) {
@ -1188,7 +1188,7 @@ pk_fragment(lcp, m0, qbit, mbit, wait)
if (m == 0)
goto abort;
*mp = m;
mp = &m->m_act;
mp = &m->m_nextpkt;
*mp = 0;
xp = mtod(m, struct x25_packet *);
0[(char *) xp] = 0;
@ -1204,8 +1204,8 @@ pk_fragment(lcp, m0, qbit, mbit, wait)
SMBIT(xp, 1);
} while ((m = next) != NULL);
for (m = head; m; m = next) {
next = m->m_act;
m->m_act = 0;
next = m->m_nextpkt;
m->m_nextpkt = 0;
sbappendrecord(sb, m);
}
return 0;
@ -1215,7 +1215,7 @@ abort:
if (next)
m_freem(next);
for (m = head; m; m = next) {
next = m->m_act;
next = m->m_nextpkt;
m_freem(m);
}
return ENOBUFS;

12
sys/netinet/ip_fil.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_fil.c,v 1.69 2001/09/17 17:27:00 thorpej Exp $ */
/* $NetBSD: ip_fil.c,v 1.70 2001/10/18 20:17:29 thorpej Exp $ */
/*
* Copyright (C) 1993-2000 by Darren Reed.
@ -9,7 +9,7 @@
*/
#if !defined(lint)
#if defined(__NetBSD__)
static const char rcsid[] = "$NetBSD: ip_fil.c,v 1.69 2001/09/17 17:27:00 thorpej Exp $";
static const char rcsid[] = "$NetBSD: ip_fil.c,v 1.70 2001/10/18 20:17:29 thorpej Exp $";
#else
static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_fil.c,v 2.42.2.17 2000/10/19 15:39:42 darrenr Exp";
@ -1536,7 +1536,7 @@ frdest_t *fdp;
{
int mhlen, firstlen = len;
struct mbuf **mnext = &m->m_act;
struct mbuf **mnext = &m->m_nextpkt;
/*
* Loop through length of segment after first fragment,
@ -1587,7 +1587,7 @@ frdest_t *fdp;
mhip->ip_sum = 0;
mhip->ip_sum = in_cksum(m, mhlen);
*mnext = m;
mnext = &m->m_act;
mnext = &m->m_nextpkt;
}
/*
* Update first fragment by trimming what's been copied out
@ -1600,8 +1600,8 @@ frdest_t *fdp;
ip->ip_sum = in_cksum(m0, hlen);
sendorfree:
for (m = m0; m; m = m0) {
m0 = m->m_act;
m->m_act = 0;
m0 = m->m_nextpkt;
m->m_nextpkt = 0;
if (error == 0)
# if BSD >= 199306
error = (*ifp->if_output)(ifp, m,

6
sys/netiso/iso_chksum.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iso_chksum.c,v 1.14 2001/04/13 23:30:28 thorpej Exp $ */
/* $NetBSD: iso_chksum.c,v 1.15 2001/10/18 20:17:30 thorpej Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -332,7 +332,7 @@ m_compress(in, out)
return -1;
}
(*out)->m_len = 0;
(*out)->m_act = NULL;
(*out)->m_nextpkt = NULL;
while (in) {
#ifdef ARGO_DEBUG
@ -383,7 +383,7 @@ m_compress(in, out)
return -1;
}
(*out)->m_len = 0;
(*out)->m_act = NULL;
(*out)->m_nextpkt = NULL;
*out = (*out)->m_next;
}
}

6
sys/netiso/tp_emit.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tp_emit.c,v 1.13 2000/03/30 13:10:12 augustss Exp $ */
/* $NetBSD: tp_emit.c,v 1.14 2001/10/18 20:17:31 thorpej Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -211,7 +211,7 @@ tp_emit(dutype, tpcb, seq, eot, data)
goto done;
}
m->m_len = sizeof(struct tpdu);
m->m_act = MNULL;
m->m_nextpkt = MNULL;
hdr = mtod(m, struct tpdu *);
bzero((caddr_t) hdr, sizeof(struct tpdu));
@ -884,7 +884,7 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
return ENOBUFS;
}
m->m_len = sizeof(struct tpdu);
m->m_act = MNULL;
m->m_nextpkt = MNULL;
hdr = mtod(m, struct tpdu *);

6
sys/netiso/tp_output.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tp_output.c,v 1.19 2000/03/30 13:10:14 augustss Exp $ */
/* $NetBSD: tp_output.c,v 1.20 2001/10/18 20:17:32 thorpej Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -427,7 +427,7 @@ tp_ctloutput(cmd, so, level, optname, mp)
return ENOBUFS;
}
m->m_len = 0;
m->m_act = 0;
m->m_nextpkt = 0;
*mp = m;
}
/*
@ -695,7 +695,7 @@ tp_ctloutput(cmd, so, level, optname, mp)
goto done;
}
(*mp)->m_next = MNULL;
(*mp)->m_act = 0;
(*mp)->m_nextpkt = 0;
if (tpcb->tp_ucddata)
m_cat(tpcb->tp_ucddata, *mp);
else

8
sys/netiso/tp_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tp_subr.c,v 1.12 2000/03/30 13:10:15 augustss Exp $ */
/* $NetBSD: tp_subr.c,v 1.13 2001/10/18 20:17:32 thorpej Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -707,8 +707,8 @@ tp_packetize(tpcb, m, eotsdu)
if (tpcb->tp_oktonagle) {
if ((n = sb->sb_mb) == 0)
panic("tp_packetize");
while (n->m_act)
n = n->m_act;
while (n->m_nextpkt)
n = n->m_nextpkt;
if (n->m_flags & M_EOR)
panic("tp_packetize 2");
SEQ_INC(tpcb, tpcb->tp_sndnum);
@ -796,7 +796,7 @@ tp_stash(tpcb, e)
if (E.e_eot) {
struct mbuf *n = E.e_data;
n->m_flags |= M_EOR;
n->m_act = 0;
n->m_nextpkt = 0;
}
#ifdef ARGO_DEBUG
if (argo_debug[D_STASH]) {

4
sys/netiso/tp_subr2.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tp_subr2.c,v 1.18 2001/08/20 12:20:07 wiz Exp $ */
/* $NetBSD: tp_subr2.c,v 1.19 2001/10/18 20:17:33 thorpej Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -808,7 +808,7 @@ tp0_stash(tpcb, e)
if (E.e_eot) {
struct mbuf *n = E.e_data;
n->m_flags |= M_EOR;
n->m_act = NULL; /* set on tp_input */
n->m_nextpkt = NULL; /* set on tp_input */
}
sbappend(sb, E.e_data);
#ifdef ARGO_DEBUG

10
sys/netiso/tp_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tp_usrreq.c,v 1.15 2000/03/30 13:10:16 augustss Exp $ */
/* $NetBSD: tp_usrreq.c,v 1.16 2001/10/18 20:17:33 thorpej Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -117,11 +117,11 @@ dump_mbuf(n, str)
return;
}
while (n) {
nextrecord = n->m_act;
nextrecord = n->m_nextpkt;
printf("RECORD:\n");
while (n) {
printf("%p : Len %x Data %p A %p Nx %p Tp %x\n",
n, n->m_len, n->m_data, n->m_act, n->m_next, n->m_type);
n, n->m_len, n->m_data, n->m_nextpkt, n->m_next, n->m_type);
#ifdef notdef
{
char *p = mtod(n, char *);
@ -207,7 +207,7 @@ restart:
*/
sblock(sb, M_WAITOK);
for (nn = &sb->sb_mb; (n = *nn) != NULL; nn = &n->m_act)
for (nn = &sb->sb_mb; (n = *nn) != NULL; nn = &n->m_nextpkt)
if (n->m_type == MT_OOBDATA)
break;
@ -247,7 +247,7 @@ restart:
if ((inflags & MSG_PEEK) == 0) {
n = *nn;
*nn = n->m_act;
*nn = n->m_nextpkt;
for (; n; n = m_free(n))
sbfree(sb, n);
}

6
sys/netns/spp_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: spp_usrreq.c,v 1.25 2001/06/19 07:37:17 jdolecek Exp $ */
/* $NetBSD: spp_usrreq.c,v 1.26 2001/10/18 20:17:34 thorpej Exp $ */
/*
* Copyright (c) 1984, 1985, 1986, 1987, 1993
@ -732,7 +732,7 @@ struct nspcb *nsp;
sb = &nsp->nsp_socket->so_snd;
cb->s_mtu = ep->ns_err_param;
badseq = SI(&ep->ns_err_idp)->si_seq;
for (m = sb->sb_mb; m; m = m->m_act) {
for (m = sb->sb_mb; m; m = m->m_nextpkt) {
si = mtod(m, struct spidp *);
if (si->si_seq == badseq)
break;
@ -1018,7 +1018,7 @@ send:
si = 0;
if (len > 0) {
cb->s_want = cb->s_snxt;
for (m = sb->sb_mb; m; m = m->m_act) {
for (m = sb->sb_mb; m; m = m->m_nextpkt) {
si = mtod(m, struct spidp *);
if (SSEQ_LEQ(cb->s_snxt, si->si_seq))
break;

3
sys/sys/mbuf.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: mbuf.h,v 1.62 2001/10/05 02:08:09 thorpej Exp $ */
/* $NetBSD: mbuf.h,v 1.63 2001/10/18 20:17:35 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2001 The NetBSD Foundation, Inc.
@ -183,7 +183,6 @@ struct mbuf {
#define m_type m_hdr.mh_type
#define m_flags m_hdr.mh_flags
#define m_nextpkt m_hdr.mh_nextpkt
#define m_act m_nextpkt
#define m_pkthdr M_dat.MH.MH_pkthdr
#define m_ext M_dat.MH.MH_dat.MH_ext
#define m_pktdat M_dat.MH.MH_dat.MH_databuf