Remove commons; inspired by netbsd.

5 files changed, 15 insertions, 10 deletions

diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 7ee803b7dbc..738535168dd 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.c,v 1.32 2003/01/07 09:00:33 kjc Exp $	*/
+/*	$OpenBSD: if_ppp.c,v 1.33 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $	*/
 
 /*
@@ -162,6 +162,8 @@
 #include <net/ppp-comp.h>
 #endif
 
+struct	ppp_softc ppp_softc[NPPP];
+
 static int	pppsioctl(struct ifnet *, u_long, caddr_t);
 static void	ppp_requeue(struct ppp_softc *);
 static void	ppp_ccp(struct ppp_softc *, struct mbuf *m, int rcvd);
diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h
index a90f77a2b87..835b0d37fa9 100644
--- a/sys/net/if_pppvar.h
+++ b/sys/net/if_pppvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pppvar.h,v 1.13 2002/09/13 00:12:07 deraadt Exp $	*/
+/*	$OpenBSD: if_pppvar.h,v 1.14 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: if_pppvar.h,v 1.5 1997/01/03 07:23:29 mikel Exp $	*/
 /*
  * if_pppvar.h - private structures and declarations for PPP.
@@ -133,7 +133,7 @@ struct ppp_softc {
 };
 
 #ifdef _KERNEL
-struct	ppp_softc ppp_softc[NPPP];
+extern	struct ppp_softc ppp_softc[];
 
 struct	ppp_softc *pppalloc(pid_t pid);
 void	pppdealloc(struct ppp_softc *sc);
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 079df8073a7..af5e23f582e 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.319 2003/02/12 12:50:29 mcbride Exp $ */
+/*	$OpenBSD: pf.c,v 1.320 2003/02/12 14:41:07 jason Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -142,7 +142,6 @@ int			*pftm_timeouts[PFTM_MAX] = { &pftm_tcp_first_packet,
 
 struct pool		 pf_tree_pl, pf_rule_pl, pf_addr_pl;
 struct pool		 pf_state_pl, pf_altq_pl, pf_pooladdr_pl;
-struct pool		 pfr_ktable_pl, pfr_kentry_pl;
 
 void			 pf_addrcpy(struct pf_addr *, struct pf_addr *,
 			    sa_family_t);
diff --git a/sys/net/route.c b/sys/net/route.c
index 81a4b24eb71..a9df5dcdec9 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.34 2002/09/11 05:38:47 itojun Exp $	*/
+/*	$OpenBSD: route.c,v 1.35 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $	*/
 
 /*
@@ -135,6 +135,10 @@ extern struct ifnet encif;
 
 #define	SA(p) ((struct sockaddr *)(p))
 
+struct	route_cb route_cb;
+struct	rtstat  rtstat;
+struct	radix_node_head *rt_tables[AF_MAX+1];
+
 int	rttrash;		/* routes not in table but not freed */
 struct	sockaddr wildcard;	/* zero valued cookie for wildcard searches */
 
diff --git a/sys/net/route.h b/sys/net/route.h
index b30ca9b86fb..a92ffdb17f5 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.h,v 1.15 2003/01/17 17:48:25 camield Exp $	*/
+/*	$OpenBSD: route.h,v 1.16 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $	*/
 
 /*
@@ -284,9 +284,9 @@ struct rttimer_queue {
 #define	ONNET_CLONING 1
 #define	NO_CLONING 2
 
-struct	route_cb route_cb;
-struct	rtstat	rtstat;
-struct	radix_node_head *rt_tables[AF_MAX+1];
+extern struct route_cb route_cb;
+extern struct rtstat rtstat;
+extern struct radix_node_head *rt_tables[];
 
 struct	socket;
 void	 route_init(void);