From e814937e0b8929748ad80c27bda32c1532131084 Mon Sep 17 00:00:00 2001
From: msmith <msmith@FreeBSD.org>
Date: Tue, 8 Jan 2002 10:30:09 +0000
Subject: [PATCH] Staticise private interface lists.

---
 sys/net/if_faith.c  | 2 +-
 sys/net/if_gif.c    | 2 +-
 sys/net/if_ppp.c    | 2 +-
 sys/net/if_pppvar.h | 2 --
 sys/net/if_sl.c     | 2 +-
 sys/net/if_stf.c    | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c
index 84de3eed07d8..f779f35f4c27 100644
--- a/sys/net/if_faith.c
+++ b/sys/net/if_faith.c
@@ -103,7 +103,7 @@ static int faithmodevent __P((module_t, int, void *));
 
 static MALLOC_DEFINE(M_FAITH, FAITHNAME, "Firewall Assisted Tunnel Interface");
 static struct rman faithunits[1];
-LIST_HEAD(, faith_softc) faith_softc_list;
+static LIST_HEAD(, faith_softc) faith_softc_list;
 
 int	faith_clone_create __P((struct if_clone *, int *));
 void	faith_clone_destroy __P((struct ifnet *));
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index 22ebf8f092ab..41c64ecf4b8d 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -85,7 +85,7 @@
 
 static MALLOC_DEFINE(M_GIF, "gif", "Generic Tunnel Interface");
 static struct rman gifunits[1];
-LIST_HEAD(, gif_softc) gif_softc_list;
+static LIST_HEAD(, gif_softc) gif_softc_list;
 
 void	(*ng_gif_input_p)(struct ifnet *ifp, struct mbuf **mp, int af);
 void	(*ng_gif_input_orphan_p)(struct ifnet *ifp, struct mbuf *m, int af);
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 95b96845b32c..8f7c38d46073 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -130,7 +130,7 @@
 #include <net/ppp_comp.h>
 #endif
 
-struct ppp_softc ppp_softc[NPPP];
+static struct ppp_softc ppp_softc[NPPP];
 
 /* XXX layering violation */
 extern void	pppasyncattach __P((void *));
diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h
index cc718469029f..cd6ea3d41cda 100644
--- a/sys/net/if_pppvar.h
+++ b/sys/net/if_pppvar.h
@@ -98,8 +98,6 @@ struct ppp_softc {
 	int	sc_rawin_count;		/* # in sc_rawin */
 };
 
-extern struct ppp_softc ppp_softc[];
-
 struct	ppp_softc *pppalloc __P((pid_t pid));
 void	pppdealloc __P((struct ppp_softc *sc));
 int	pppioctl __P((struct ppp_softc *sc, u_long cmd, caddr_t data,
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 35d67e23c47e..7d3b51de7f4e 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -165,7 +165,7 @@ static MALLOC_DEFINE(M_SL, "sl", "SLIP Interface");
 #define	ABT_COUNT	3	/* count of escapes for abort */
 #define	ABT_WINDOW	(ABT_COUNT*2+2)	/* in seconds - time to count */
 
-LIST_HEAD(sl_list, sl_softc) sl_list;
+static LIST_HEAD(sl_list, sl_softc) sl_list;
 
 #define FRAME_END	 	0xc0		/* Frame End */
 #define FRAME_ESCAPE		0xdb		/* Frame Esc */
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index 41b5a92c5e22..b0344ab7e0e0 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -135,7 +135,7 @@ struct stf_softc {
 	LIST_ENTRY(stf_softc) sc_list;	/* all stf's are linked */
 };
 
-LIST_HEAD(, stf_softc) stf_softc_list;
+static LIST_HEAD(, stf_softc) stf_softc_list;
 
 static MALLOC_DEFINE(M_STF, STFNAME, "6to4 Tunnel Interface");
 static struct rman stfunits[1];