Remove commons; inspired by netbsd.

14 files changed, 33 insertions, 21 deletions

diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index dcc9233d40b..e233cc58d28 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp_var.h,v 1.9 2002/06/09 02:11:47 jsyn Exp $	*/
+/*	$OpenBSD: icmp_var.h,v 1.10 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: icmp_var.h,v 1.8 1995/03/26 20:32:19 jtc Exp $	*/
 
 /*
@@ -81,6 +81,6 @@ struct	icmpstat {
 }
 
 #ifdef _KERNEL
-struct	icmpstat icmpstat;
+extern struct	icmpstat icmpstat;
 #endif /* _KERNEL */
 #endif /* _NETINET_ICMP_VAR_H_ */
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index db98e185411..33ad717ab19 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: igmp.c,v 1.16 2002/08/28 15:43:03 pefo Exp $	*/
+/*	$OpenBSD: igmp.c,v 1.17 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: igmp.c,v 1.15 1996/02/13 23:41:25 christos Exp $	*/
 
 /*
@@ -34,6 +34,7 @@
 
 int		igmp_timers_are_running;
 static struct router_info *rti_head;
+struct igmpstat igmpstat;
 
 void igmp_sendpkt(struct in_multi *, int, in_addr_t);
 static int rti_fill(struct in_multi *);
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index 2c7605f9585..0397e66d567 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: igmp_var.h,v 1.5 2002/03/14 01:27:11 millert Exp $	*/
+/*	$OpenBSD: igmp_var.h,v 1.6 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: igmp_var.h,v 1.9 1996/02/13 23:41:31 christos Exp $	*/
 
 /*
@@ -67,7 +67,7 @@ struct igmpstat {
 };
 
 #ifdef _KERNEL
-struct igmpstat igmpstat;
+extern struct igmpstat igmpstat;
 
 /*
  * Macro to compute a random timer value between 1 and (IGMP_MAX_REPORTING_
diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c
index dd34a5c4ad8..c8a6ca640db 100644
--- a/sys/netinet/ip_ah.c
+++ b/sys/netinet/ip_ah.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ah.c,v 1.70 2002/07/05 23:20:53 angelos Exp $ */
+/*	$OpenBSD: ip_ah.c,v 1.71 2003/02/12 14:41:07 jason Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -73,6 +73,8 @@
 #define DPRINTF(x)
 #endif
 
+struct ahstat ahstat;
+
 /*
  * ah_attach() is called from the transformation initialization code.
  */
diff --git a/sys/netinet/ip_ah.h b/sys/netinet/ip_ah.h
index a0a353e1305..91c1eba52cd 100644
--- a/sys/netinet/ip_ah.h
+++ b/sys/netinet/ip_ah.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ah.h,v 1.29 2002/06/09 16:26:10 itojun Exp $	*/
+/*	$OpenBSD: ip_ah.h,v 1.30 2003/02/12 14:41:07 jason Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -88,6 +88,6 @@ struct ah
 
 #ifdef _KERNEL
 extern int ah_enable;
-struct ahstat ahstat;
+extern struct ahstat ahstat;
 #endif /* _KERNEL */
 #endif /* _NETINET_IP_AH_H_ */
diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c
index 97b47eb8cd8..87100c7b875 100644
--- a/sys/netinet/ip_esp.c
+++ b/sys/netinet/ip_esp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_esp.c,v 1.77 2003/02/01 14:11:40 dhartmei Exp $ */
+/*	$OpenBSD: ip_esp.c,v 1.78 2003/02/12 14:41:07 jason Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -74,6 +74,8 @@
 #define DPRINTF(x)
 #endif
 
+struct espstat espstat;
+
 /*
  * esp_attach() is called from the transformation initialization code.
  */
diff --git a/sys/netinet/ip_esp.h b/sys/netinet/ip_esp.h
index fb6a0f26228..6be3aafcf23 100644
--- a/sys/netinet/ip_esp.h
+++ b/sys/netinet/ip_esp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_esp.h,v 1.37 2002/06/09 16:26:10 itojun Exp $	*/
+/*	$OpenBSD: ip_esp.h,v 1.38 2003/02/12 14:41:07 jason Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -76,6 +76,6 @@ struct espstat
 
 #ifdef _KERNEL
 extern int esp_enable;
-struct espstat espstat;
+extern struct espstat espstat;
 #endif /* _KERNEL */
 #endif /* _NETINET_IP_ESP_H_ */
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index abc3b15b329..bd675f1015d 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_icmp.c,v 1.56 2003/02/01 19:34:06 henning Exp $	*/
+/*	$OpenBSD: ip_icmp.c,v 1.57 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: ip_icmp.c,v 1.19 1996/02/13 23:42:22 christos Exp $	*/
 
 /*
@@ -108,6 +108,7 @@ struct timeval icmperrppslim_last;
 int	icmp_rediraccept = 1;
 int	icmp_redirtimeout = 10 * 60;
 static struct rttimer_queue *icmp_redirect_timeout_q = NULL;
+struct	icmpstat icmpstat;
 
 void icmp_mtudisc_timeout(struct rtentry *, struct rttimer *);
 int icmp_ratelimit(const struct in_addr *, const int, const int);
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 8fe498db903..cee5710847a 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_input.c,v 1.109 2003/02/11 21:08:04 cedric Exp $	*/
+/*	$OpenBSD: ip_input.c,v 1.110 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $	*/
 
 /*
@@ -86,6 +86,8 @@
 #define IPMTUDISCTIMEOUT (10 * 60)	/* as per RFC 1191 */
 #endif
 
+struct ipqhead ipq;
+
 int encdebug = 0;
 int ipsec_keep_invalid = IPSEC_DEFAULT_EMBRYONIC_SA_TIMEOUT;
 int ipsec_require_pfs = IPSEC_DEFAULT_PFS;
diff --git a/sys/netinet/ip_ipcomp.c b/sys/netinet/ip_ipcomp.c
index 5a84f2e6e7d..a7afa74975f 100644
--- a/sys/netinet/ip_ipcomp.c
+++ b/sys/netinet/ip_ipcomp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipcomp.c,v 1.9 2002/09/12 10:11:39 ho Exp $ */
+/* $OpenBSD: ip_ipcomp.c,v 1.10 2003/02/12 14:41:07 jason Exp $ */
 
 /*
  * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj@wabbitt.org)
@@ -69,6 +69,8 @@
 #define DPRINTF(x)
 #endif
 
+struct ipcompstat ipcompstat;
+
 /*
  * ipcomp_attach() is called from the transformation code
  */
diff --git a/sys/netinet/ip_ipcomp.h b/sys/netinet/ip_ipcomp.h
index 64090947985..638e4015bab 100644
--- a/sys/netinet/ip_ipcomp.h
+++ b/sys/netinet/ip_ipcomp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipcomp.h,v 1.3 2001/07/17 12:35:35 jjbg Exp $ */
+/* $OpenBSD: ip_ipcomp.h,v 1.4 2003/02/12 14:41:08 jason Exp $ */
 
 /*
  * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj@wabbitt.org)
@@ -76,6 +76,6 @@ struct ipcomp {
 
 #ifdef _KERNEL
 extern int ipcomp_enable;
-struct ipcompstat ipcompstat;
+extern struct ipcompstat ipcompstat;
 #endif				/* _KERNEL */
 #endif	/* _NETINET_IP_IPCOMP_H_ */
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index f9229be2d7f..cc4924d5f69 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_var.h,v 1.27 2002/12/09 00:45:37 millert Exp $	*/
+/*	$OpenBSD: ip_var.h,v 1.28 2003/02/12 14:41:08 jason Exp $	*/
 /*	$NetBSD: ip_var.h,v 1.16 1996/02/13 23:43:20 christos Exp $	*/
 
 /*
@@ -159,7 +159,7 @@ struct	ipstat {
 #define	IP_MTUDISC		0x0400		/* pmtu discovery, set DF */
 
 extern struct ipstat ipstat;
-LIST_HEAD(ipqhead, ipq)	ipq;		/* ip reass. queue */
+extern LIST_HEAD(ipqhead, ipq)	ipq;	/* ip reass. queue */
 extern int ip_defttl;			/* default IP ttl */
 
 extern int ip_mtudisc;			/* mtu discovery */
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 96792abdb5c..0cb17be3322 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_usrreq.c,v 1.67 2002/09/11 03:15:36 itojun Exp $	*/
+/*	$OpenBSD: tcp_usrreq.c,v 1.68 2003/02/12 14:41:08 jason Exp $	*/
 /*	$NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $	*/
 
 /*
@@ -111,6 +111,8 @@ extern int tcp_rst_ppslim;
 /* from in_pcb.c */
 extern	struct baddynamicports baddynamicports;
 
+struct	inpcbtable tcbtable;
+
 int tcp_ident(void *, size_t *, void *, size_t);
 
 #ifdef INET6
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 45cb0bdcd18..f195b68745e 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_var.h,v 1.44 2002/06/09 16:26:11 itojun Exp $	*/
+/*	$OpenBSD: tcp_var.h,v 1.45 2003/02/12 14:41:08 jason Exp $	*/
 /*	$NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $	*/
 
 /*
@@ -369,7 +369,7 @@ struct tcp_ident_mapping {
 };
 
 #ifdef _KERNEL
-struct	inpcbtable tcbtable;	/* head of queue of active tcpcb's */
+extern	struct inpcbtable tcbtable;	/* head of queue of active tcpcb's */
 extern	struct tcpstat tcpstat;	/* tcp statistics */
 u_int32_t tcp_now;		/* for RFC 1323 timestamps */
 extern	int tcp_do_rfc1323;	/* enabled/disabled? */