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 /sys/netinet/ip_divert.c | |
| 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 'sys/netinet/ip_divert.c')
| -rw-r--r-- | sys/netinet/ip_divert.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 60d1a9d512e..2296197ecbc 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_divert.c,v 1.14 2013/11/15 16:46:15 lteo Exp $ */ +/* $OpenBSD: ip_divert.c,v 1.15 2013/12/20 02:04:08 krw Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -221,7 +221,7 @@ divert_packet(struct mbuf *m, int dir) return (0); } - CIRCLEQ_FOREACH(inp, &divbtable.inpt_queue, inp_queue) { + TAILQ_FOREACH(inp, &divbtable.inpt_queue, inp_queue) { if (inp->inp_lport != divert->port) continue; if (inp->inp_divertfl == 0) @@ -254,7 +254,7 @@ divert_packet(struct mbuf *m, int dir) if (dir == PF_OUT) in_proto_cksum_out(m, NULL); - if (inp != CIRCLEQ_END(&divbtable.inpt_queue)) { + if (inp) { sa = inp->inp_socket; if (sbappendaddr(&sa->so_rcv, (struct sockaddr *)&addr, m, NULL) == 0) { |