diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-12-20 02:04:10 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-12-20 02:04:10 +0000 |
| commit | 1701ff0f9bf0e11e455ae8c89d2ce46ea80776de (patch) | |
| tree | f7a0f219c687344232ef5f075eb14c8d3ff1f089 /usr.bin/systat | |
| parent | 9679d04a53c6b3dfbddef7675d6e518a3352e495 (diff) | |
Switch inpt_queue from CIRCLEQ to TAILQ. Thus ending use of CIRCLEQ
in the base. Ports fixes to follow shortly for the two ports (gkrellm
and net-snmp) affected.
ok zhuk@ millert@
Diffstat (limited to 'usr.bin/systat')
| -rw-r--r-- | usr.bin/systat/netstat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c index 5ad3ebd27ce..652aa32f94d 100644 --- a/usr.bin/systat/netstat.c +++ b/usr.bin/systat/netstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netstat.c,v 1.36 2013/03/20 06:55:24 deraadt Exp $ */ +/* $OpenBSD: netstat.c,v 1.37 2013/12/20 02:04:09 krw Exp $ */ /* $NetBSD: netstat.c,v 1.3 1995/06/18 23:53:07 cgd Exp $ */ /*- @@ -263,16 +263,16 @@ again: KREAD(off, &pcbtable, sizeof (struct inpcbtable)); prev = head = (struct inpcb *)&((struct inpcbtable *)off)->inpt_queue; - next = CIRCLEQ_FIRST(&pcbtable.inpt_queue); + next = TAILQ_FIRST(&pcbtable.inpt_queue); while (next != head) { KREAD(next, &inpcb, sizeof (inpcb)); - if (CIRCLEQ_PREV(&inpcb, inp_queue) != prev) { + if (TAILQ_PREV(&inpcb, inpthead, inp_queue) != prev) { error("Kernel state in transition"); return 0; } prev = next; - next = CIRCLEQ_NEXT(&inpcb, inp_queue); + next = TAILQ_NEXT(&inpcb, inp_queue); if (!aflag) { if (!(inpcb.inp_flags & INP_IPV6) && |