diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2012-01-09 01:01:13 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2012-01-09 01:01:13 +0000 |
| commit | 554237d5ea33d1ea5188d602f55c2198cda0cced (patch) | |
| tree | e00b9e919c13ac4390b6dbd29e3bdbf4d94f51bc /sys/netinet6/ip6_var.h | |
| parent | 05dba8f0e019ac7c40b04f2d6b08f7bf84f35234 (diff) | |
Replace the hand-crafted queue for IPv6 fragments with LIST.
ok henning@
Diffstat (limited to 'sys/netinet6/ip6_var.h')
| -rw-r--r-- | sys/netinet6/ip6_var.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index d6a60e8efec..9fe0c130b3e 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_var.h,v 1.42 2012/01/05 21:02:42 bluhm Exp $ */ +/* $OpenBSD: ip6_var.h,v 1.43 2012/01/09 01:01:12 bluhm Exp $ */ /* $KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $ */ /* @@ -69,12 +69,8 @@ * being reassembled is attached to one of these structures. */ struct ip6q { - u_int32_t ip6q_head; - u_int16_t ip6q_len; u_int8_t ip6q_nxt; /* ip6f_nxt in first fragment */ - u_int8_t ip6q_hlim; - struct ip6asfrag *ip6q_down; - struct ip6asfrag *ip6q_up; + LIST_HEAD(ip6asfrag_list, ip6asfrag) ip6q_asfrag; u_int32_t ip6q_ident; u_int8_t ip6q_arrive; u_int8_t ip6q_ttl; @@ -93,8 +89,7 @@ struct ip6asfrag { u_int8_t ip6af_nxt; u_int8_t ip6af_hlim; /* must not override the above members during reassembling */ - struct ip6asfrag *ip6af_down; - struct ip6asfrag *ip6af_up; + LIST_ENTRY(ip6asfrag) ip6af_list; struct mbuf *ip6af_m; int ip6af_offset; /* offset in ip6af_m to next header */ int ip6af_frglen; /* fragmentable part length */ |