diff options
author | bde <bde@FreeBSD.org> | 2002-09-05 19:48:52 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 2002-09-05 19:48:52 +0000 |
commit | 58f67268dfe45f4ceaf9573e37063e5ee431e691 (patch) | |
tree | 3117401f9f981eb9ce01e895a695d8691bf37f60 /sys/netinet | |
parent | 315e4703e1c4f2f355efade7ef3fdc4442efe279 (diff) | |
download | FreeBSD-src-58f67268dfe45f4ceaf9573e37063e5ee431e691.zip FreeBSD-src-58f67268dfe45f4ceaf9573e37063e5ee431e691.tar.gz |
Fixed namespace pollution in uma changes:
- use `struct uma_zone *' instead of uma_zone_t, so that <sys/uma.h> isn't
a prerequisite.
- don't include <sys/uma.h>.
Namespace pollution makes "opaque" types like uma_zone_t perfectly
non-opaque. Such types should never be used (see style(9)).
Fixed subsequently grwon dependencies of this header on its own pollution:
- include <sys/_mutex.h> and its prerequisite <sys/_lock.h> instead of
depending on namespace pollution 2 layers deep in <sys/uma.h>.
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/in_pcb.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 1654eb9..4fe626b 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -38,10 +38,11 @@ #define _NETINET_IN_PCB_H_ #include <sys/queue.h> +#include <sys/_lock.h> +#include <sys/_mutex.h> #include <net/route.h> #include <netinet6/ipsec.h> /* for IPSEC */ -#include <vm/uma.h> #define in6pcb inpcb /* for KAME src sync over BSD*'s */ #define in6p_sp inp_sp /* for KAME src sync over BSD*'s */ @@ -238,7 +239,7 @@ struct inpcbinfo { /* XXX documentation, prefixes */ u_short lastport; u_short lastlow; u_short lasthi; - uma_zone_t ipi_zone; /* zone to allocate pcbs from */ + struct uma_zone *ipi_zone; /* zone to allocate pcbs from */ u_int ipi_count; /* number of pcbs in this list */ u_quad_t ipi_gencnt; /* current generation count */ struct mtx ipi_mtx; |