diff options
author | tanimura <tanimura@FreeBSD.org> | 2002-04-30 01:54:54 +0000 |
---|---|---|
committer | tanimura <tanimura@FreeBSD.org> | 2002-04-30 01:54:54 +0000 |
commit | 89ec521d918cc9582731bc57c7d9d39010f3ccba (patch) | |
tree | 949babd3de74c52d345786e2c0f418722c5d6351 /sys/netinet | |
parent | c52db1bfdfb3a9e4065f735384e8e23dd29a14c0 (diff) | |
download | FreeBSD-src-89ec521d918cc9582731bc57c7d9d39010f3ccba.zip FreeBSD-src-89ec521d918cc9582731bc57c7d9d39010f3ccba.tar.gz |
Revert the change of #includes in sys/filedesc.h and sys/socketvar.h.
Requested by: bde
Since locking sigio_lock is usually followed by calling pgsigio(),
move the declaration of sigio_lock and the definitions of SIGIO_*() to
sys/signalvar.h.
While I am here, sort include files alphabetically, where possible.
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/accf_data.c | 5 | ||||
-rw-r--r-- | sys/netinet/accf_http.c | 5 | ||||
-rw-r--r-- | sys/netinet/ip_divert.c | 9 | ||||
-rw-r--r-- | sys/netinet/ip_mroute.c | 19 | ||||
-rw-r--r-- | sys/netinet/raw_ip.c | 7 | ||||
-rw-r--r-- | sys/netinet/tcp_input.c | 15 | ||||
-rw-r--r-- | sys/netinet/tcp_reass.c | 15 | ||||
-rw-r--r-- | sys/netinet/udp_usrreq.c | 15 |
8 files changed, 57 insertions, 33 deletions
diff --git a/sys/netinet/accf_data.c b/sys/netinet/accf_data.c index d38b165..dd710e6 100644 --- a/sys/netinet/accf_data.c +++ b/sys/netinet/accf_data.c @@ -29,9 +29,12 @@ #define ACCEPT_FILTER_MOD #include <sys/param.h> -#include <sys/sysctl.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/sysctl.h> +#include <sys/signalvar.h> #include <sys/socketvar.h> +#include <sys/sx.h> /* accept filter that holds a socket until data arrives */ diff --git a/sys/netinet/accf_http.c b/sys/netinet/accf_http.c index 73c9af2..0396b3a 100644 --- a/sys/netinet/accf_http.c +++ b/sys/netinet/accf_http.c @@ -31,9 +31,12 @@ #include <sys/param.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/mbuf.h> +#include <sys/signalvar.h> #include <sys/sysctl.h> #include <sys/socketvar.h> -#include <sys/mbuf.h> +#include <sys/sx.h> /* check for GET/HEAD */ static void sohashttpget(struct socket *so, void *arg, int waitflag); diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index d022f72..8f56d2c 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -44,12 +44,15 @@ #include <sys/param.h> #include <sys/kernel.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/proc.h> -#include <sys/socket.h> #include <sys/protosw.h> +#include <sys/signalvar.h> +#include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> #include <sys/sysctl.h> #include <sys/systm.h> @@ -59,10 +62,10 @@ #include <net/route.h> #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/ip.h> #include <netinet/in_pcb.h> +#include <netinet/in_systm.h> #include <netinet/in_var.h> +#include <netinet/ip.h> #include <netinet/ip_var.h> /* diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index f9fa8cd..0be45ea 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -16,27 +16,30 @@ #include "opt_random_ip_id.h" #include <sys/param.h> -#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> +#include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/protosw.h> -#include <sys/time.h> -#include <sys/kernel.h> -#include <sys/sysctl.h> #include <sys/sockio.h> +#include <sys/sx.h> +#include <sys/sysctl.h> #include <sys/syslog.h> +#include <sys/systm.h> +#include <sys/time.h> #include <net/if.h> #include <net/route.h> #include <netinet/in.h> +#include <netinet/igmp.h> #include <netinet/in_systm.h> -#include <netinet/ip.h> -#include <netinet/ip_var.h> #include <netinet/in_var.h> -#include <netinet/igmp.h> +#include <netinet/ip.h> #include <netinet/ip_encap.h> #include <netinet/ip_mroute.h> +#include <netinet/ip_var.h> #include <netinet/udp.h> #include <machine/in_cksum.h> diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 3b44d02..86915fc 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -39,15 +39,18 @@ #include "opt_random_ip_id.h" #include <sys/param.h> -#include <sys/systm.h> #include <sys/kernel.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/proc.h> #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> #include <sys/sysctl.h> +#include <sys/systm.h> #include <vm/uma.h> @@ -57,9 +60,9 @@ #define _IP_VHL #include <netinet/in.h> #include <netinet/in_systm.h> -#include <netinet/ip.h> #include <netinet/in_pcb.h> #include <netinet/in_var.h> +#include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/ip_mroute.h> diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 09be5d2..2a78e5e 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -41,16 +41,19 @@ #include "opt_tcp_input.h" #include <sys/param.h> -#include <sys/systm.h> #include <sys/kernel.h> -#include <sys/sysctl.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/proc.h> /* for proc0 declaration */ #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> +#include <sys/sysctl.h> #include <sys/syslog.h> +#include <sys/systm.h> #include <machine/cpu.h> /* before tcp_seq.h, for tcp_random18() */ @@ -58,19 +61,19 @@ #include <net/route.h> #include <netinet/in.h> +#include <netinet/in_pcb.h> #include <netinet/in_systm.h> +#include <netinet/in_var.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> /* for ICMP_BANDLIM */ -#include <netinet/in_var.h> #include <netinet/icmp_var.h> /* for ICMP_BANDLIM */ -#include <netinet/in_pcb.h> #include <netinet/ip_var.h> #ifdef INET6 #include <netinet/ip6.h> #include <netinet/icmp6.h> -#include <netinet6/nd6.h> -#include <netinet6/ip6_var.h> #include <netinet6/in6_pcb.h> +#include <netinet6/ip6_var.h> +#include <netinet6/nd6.h> #endif #include <netinet/tcp.h> #include <netinet/tcp_fsm.h> diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 09be5d2..2a78e5e 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -41,16 +41,19 @@ #include "opt_tcp_input.h" #include <sys/param.h> -#include <sys/systm.h> #include <sys/kernel.h> -#include <sys/sysctl.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/proc.h> /* for proc0 declaration */ #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> +#include <sys/sysctl.h> #include <sys/syslog.h> +#include <sys/systm.h> #include <machine/cpu.h> /* before tcp_seq.h, for tcp_random18() */ @@ -58,19 +61,19 @@ #include <net/route.h> #include <netinet/in.h> +#include <netinet/in_pcb.h> #include <netinet/in_systm.h> +#include <netinet/in_var.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> /* for ICMP_BANDLIM */ -#include <netinet/in_var.h> #include <netinet/icmp_var.h> /* for ICMP_BANDLIM */ -#include <netinet/in_pcb.h> #include <netinet/ip_var.h> #ifdef INET6 #include <netinet/ip6.h> #include <netinet/icmp6.h> -#include <netinet6/nd6.h> -#include <netinet6/ip6_var.h> #include <netinet6/in6_pcb.h> +#include <netinet6/ip6_var.h> +#include <netinet6/nd6.h> #endif #include <netinet/tcp.h> #include <netinet/tcp_fsm.h> diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 04e68f9..af4769f 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -39,17 +39,20 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/domain.h> +#include <sys/jail.h> #include <sys/kernel.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> -#include <sys/domain.h> #include <sys/proc.h> #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> #include <sys/sysctl.h> #include <sys/syslog.h> -#include <sys/jail.h> #include <vm/uma.h> @@ -58,18 +61,18 @@ #include <netinet/in.h> #include <netinet/in_systm.h> +#include <netinet/in_pcb.h> +#include <netinet/in_var.h> #include <netinet/ip.h> #ifdef INET6 #include <netinet/ip6.h> #endif -#include <netinet/in_pcb.h> -#include <netinet/in_var.h> +#include <netinet/ip_icmp.h> +#include <netinet/icmp_var.h> #include <netinet/ip_var.h> #ifdef INET6 #include <netinet6/ip6_var.h> #endif -#include <netinet/ip_icmp.h> -#include <netinet/icmp_var.h> #include <netinet/udp.h> #include <netinet/udp_var.h> |