diff options
-rw-r--r-- | sys/netinet/in_pcb.c | 5 | ||||
-rw-r--r-- | sys/netinet/in_pcb.h | 11 | ||||
-rw-r--r-- | sys/netinet/ip_divert.c | 5 | ||||
-rw-r--r-- | sys/netinet/raw_ip.c | 5 | ||||
-rw-r--r-- | sys/netinet/tcp_subr.c | 12 | ||||
-rw-r--r-- | sys/netinet/tcp_timewait.c | 12 | ||||
-rw-r--r-- | sys/netinet/udp_usrreq.c | 8 |
7 files changed, 33 insertions, 25 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 59bb5d9..849e26f 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 - * $Id: in_pcb.c,v 1.39 1998/03/01 19:39:26 guido Exp $ + * $Id: in_pcb.c,v 1.40 1998/03/24 18:06:08 wollman Exp $ */ #include <sys/param.h> @@ -44,7 +44,8 @@ #include <sys/proc.h> #include <sys/kernel.h> #include <sys/sysctl.h> -#include <vm/vm_zone.h> /* for zalloci, zfreei prototypes */ + +#include <vm/vm_zone.h> #include <net/if.h> #include <net/route.h> diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 6b446ad..467a5b2 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.h 8.1 (Berkeley) 6/10/93 - * $Id: in_pcb.h,v 1.23 1998/01/27 09:15:04 davidg Exp $ + * $Id: in_pcb.h,v 1.24 1998/03/24 18:06:11 wollman Exp $ */ #ifndef _NETINET_IN_PCB_H_ @@ -74,8 +74,8 @@ struct inpcb { u_char pad[1]; /* alignment */ struct ip_moptions *inp_moptions; /* IP multicast options */ LIST_ENTRY(inpcb) inp_portlist; /* list for this PCB's local port */ - struct inpcbport *inp_phd; /* head of list for this PCB's local port */ - u_quad_t inp_gencnt; /* generation count of this instance */ + struct inpcbport *inp_phd; /* head of this list */ + u_quad_t inp_gencnt; /* generation count of this instance */ }; /* * The range of the generation count, as used in this implementation, @@ -147,7 +147,6 @@ void in_pcbnotify __P((struct inpcbhead *, struct sockaddr *, void in_pcbrehash __P((struct inpcb *)); int in_setpeeraddr __P((struct socket *so, struct sockaddr **nam)); int in_setsockaddr __P((struct socket *so, struct sockaddr **nam)); +#endif /* KERNEL */ -#endif - -#endif +#endif /* !_NETINET_IN_PCB_H_ */ diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 4eddf3a..d37e2bf 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ip_divert.c,v 1.20 1998/02/06 12:13:50 eivind Exp $ + * $Id: ip_divert.c,v 1.21 1998/03/24 18:06:15 wollman Exp $ */ #include "opt_inet.h" @@ -47,6 +47,7 @@ #include <sys/socketvar.h> #include <sys/systm.h> #include <sys/proc.h> + #include <vm/vm_zone.h> #include <net/if.h> @@ -118,7 +119,7 @@ div_init(void) divcbinfo.hashbase = hashinit(1, M_PCB, &divcbinfo.hashmask); divcbinfo.porthashbase = hashinit(1, M_PCB, &divcbinfo.porthashmask); divcbinfo.ipi_zone = zinit("divcb", sizeof(struct inpcb), - nmbclusters/4, ZONE_INTERRUPT, 0); + nmbclusters / 4, ZONE_INTERRUPT, 0); } /* diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index a8103ff..ecd90c0 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 - * $Id: raw_ip.c,v 1.51 1998/01/27 09:15:07 davidg Exp $ + * $Id: raw_ip.c,v 1.52 1998/03/24 18:06:23 wollman Exp $ */ #include <sys/param.h> @@ -44,6 +44,7 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/sysctl.h> + #include <vm/vm_zone.h> #include <net/if.h> @@ -96,7 +97,7 @@ rip_init() ripcbinfo.hashbase = hashinit(1, M_PCB, &ripcbinfo.hashmask); ripcbinfo.porthashbase = hashinit(1, M_PCB, &ripcbinfo.porthashmask); ripcbinfo.ipi_zone = zinit("ripcb", sizeof(struct inpcb), - nmbclusters/4, ZONE_INTERRUPT, 0); + nmbclusters / 4, ZONE_INTERRUPT, 0); } static struct sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET }; diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index bf424d5..7820b63 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $Id: tcp_subr.c,v 1.42 1998/01/27 09:15:10 davidg Exp $ + * $Id: tcp_subr.c,v 1.43 1998/03/24 18:06:28 wollman Exp $ */ #include "opt_compat.h" @@ -46,6 +46,7 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/protosw.h> + #include <vm/vm_zone.h> #include <net/route.h> @@ -102,8 +103,8 @@ static void tcp_notify __P((struct inpcb *, int)); * we avoid changing most of the rest of the code (although it needs * to be changed, eventually, for greater efficiency). */ -#define ALIGNMENT 32 -#define ALIGNM1 (ALIGNMENT-1) +#define ALIGNMENT 32 +#define ALIGNM1 (ALIGNMENT - 1) struct inp_tp { union { struct inpcb inp; @@ -127,7 +128,8 @@ tcp_init() LIST_INIT(&tcb); tcbinfo.listhead = &tcb; tcbinfo.hashbase = hashinit(TCBHASHSIZE, M_PCB, &tcbinfo.hashmask); - tcbinfo.porthashbase = hashinit(TCBHASHSIZE, M_PCB, &tcbinfo.porthashmask); + tcbinfo.porthashbase = hashinit(TCBHASHSIZE, M_PCB, + &tcbinfo.porthashmask); /* For the moment, we just worry about putting inpcbs here. */ /* * Rationale for a maximum of `nmbclusters': @@ -291,7 +293,7 @@ struct tcpcb * tcp_newtcpcb(inp) struct inpcb *inp; { - struct inp_tp *it; + struct inp_tp *it; register struct tcpcb *tp; it = (struct inp_tp *)inp; diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index bf424d5..7820b63 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $Id: tcp_subr.c,v 1.42 1998/01/27 09:15:10 davidg Exp $ + * $Id: tcp_subr.c,v 1.43 1998/03/24 18:06:28 wollman Exp $ */ #include "opt_compat.h" @@ -46,6 +46,7 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/protosw.h> + #include <vm/vm_zone.h> #include <net/route.h> @@ -102,8 +103,8 @@ static void tcp_notify __P((struct inpcb *, int)); * we avoid changing most of the rest of the code (although it needs * to be changed, eventually, for greater efficiency). */ -#define ALIGNMENT 32 -#define ALIGNM1 (ALIGNMENT-1) +#define ALIGNMENT 32 +#define ALIGNM1 (ALIGNMENT - 1) struct inp_tp { union { struct inpcb inp; @@ -127,7 +128,8 @@ tcp_init() LIST_INIT(&tcb); tcbinfo.listhead = &tcb; tcbinfo.hashbase = hashinit(TCBHASHSIZE, M_PCB, &tcbinfo.hashmask); - tcbinfo.porthashbase = hashinit(TCBHASHSIZE, M_PCB, &tcbinfo.porthashmask); + tcbinfo.porthashbase = hashinit(TCBHASHSIZE, M_PCB, + &tcbinfo.porthashmask); /* For the moment, we just worry about putting inpcbs here. */ /* * Rationale for a maximum of `nmbclusters': @@ -291,7 +293,7 @@ struct tcpcb * tcp_newtcpcb(inp) struct inpcb *inp; { - struct inp_tp *it; + struct inp_tp *it; register struct tcpcb *tp; it = (struct inp_tp *)inp; diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index f9dd1a7..bb1e6da 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 - * $Id: udp_usrreq.c,v 1.44 1998/01/27 09:15:13 davidg Exp $ + * $Id: udp_usrreq.c,v 1.45 1998/03/24 18:06:34 wollman Exp $ */ #include <sys/param.h> @@ -44,6 +44,7 @@ #include <sys/socketvar.h> #include <sys/sysctl.h> #include <sys/syslog.h> + #include <vm/vm_zone.h> #include <net/if.h> @@ -98,9 +99,10 @@ udp_init() LIST_INIT(&udb); udbinfo.listhead = &udb; udbinfo.hashbase = hashinit(UDBHASHSIZE, M_PCB, &udbinfo.hashmask); - udbinfo.porthashbase = hashinit(UDBHASHSIZE, M_PCB, &udbinfo.porthashmask); + udbinfo.porthashbase = hashinit(UDBHASHSIZE, M_PCB, + &udbinfo.porthashmask); udbinfo.ipi_zone = zinit("udpcb", sizeof(struct inpcb), nmbclusters, - ZONE_INTERRUPT, 0); + ZONE_INTERRUPT, 0); } void |