8 files changed, 26 insertions, 26 deletions

diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index b7faae89f4dc..35b899e074c0 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ether.c,v 1.21 1995/12/02 19:37:48 bde Exp $
+ * $Id: if_ether.c,v 1.22 1995/12/09 16:06:52 phk Exp $
  */
 
 /*
@@ -89,7 +89,7 @@ struct llinfo_arp {
 static	LIST_HEAD(, llinfo_arp) llinfo_arp;
 
 struct	ifqueue arpintrq = {0, 0, 0, 50};
-int	arp_inuse, arp_allocated, arp_intimer;
+static int	arp_inuse, arp_allocated;
 
 static int	arp_maxtries = 5;
 SYSCTL_INT(_net_arp, OID_AUTO, maxtries, CTLFLAG_RW, &arp_maxtries, 0, "");
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index c23de5b9c53e..cd834111f10c 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_icmp.c,v 1.14 1995/12/06 23:37:29 bde Exp $
+ * $Id: ip_icmp.c,v 1.15 1995/12/08 16:46:06 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -62,7 +62,7 @@
  * host table maintenance routines.
  */
 
-struct	icmpstat icmpstat;
+static struct	icmpstat icmpstat;
 SYSCTL_STRUCT(_net_inet_icmp, ICMPCTL_STATS, stats, CTLFLAG_RD,
 	&icmpstat, icmpstat, "");
 
@@ -76,6 +76,7 @@ int	icmpprintfs = 0;
 
 static void	icmp_reflect __P((struct mbuf *));
 static void	icmp_send __P((struct mbuf *, struct mbuf *));
+static int	ip_next_mtu __P((int, int));
 
 extern	struct protosw inetsw[];
 
@@ -645,7 +646,7 @@ iptime()
  * given current value MTU.  If DIR is less than zero, a larger plateau
  * is returned; otherwise, a smaller value is returned.
  */
-int
+static int
 ip_next_mtu(mtu, dir)
 	int mtu;
 	int dir;
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index f43f02687b93..a817ac8a56f2 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.28 1995/11/14 20:34:14 phk Exp $
+ * $Id: ip_input.c,v 1.29 1995/12/06 23:37:34 bde Exp $
  */
 
 #include <sys/param.h>
@@ -64,7 +64,7 @@
 
 #include <sys/socketvar.h>
 int rsvp_on = 0;
-int ip_rsvp_on;
+static int ip_rsvp_on;
 struct socket *ip_rsvpd;
 
 #ifndef	IPFORWARDING
@@ -116,7 +116,7 @@ SYSCTL_INT(_net_inet_ip, IPCTL_INTRQDROPS, intr_queue_drops, CTLFLAG_RD,
 	&ipintrq.ifq_drops, 0, "");
 
 struct ipstat ipstat;
-struct ipq ipq;
+static struct ipq ipq;
 
 #ifdef IPCTL_DEFMTU
 SYSCTL_INT(_net_inet_ip, IPCTL_DEFMTU, mtu, CTLFLAG_RW,
@@ -175,7 +175,7 @@ ip_init()
 }
 
 static struct	sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET };
-struct	route ipforward_rt;
+static struct	route ipforward_rt;
 
 /*
  * Ip input routine.  Checksum and byte swap header.  If fragmented
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index d68e283dab0c..8d8742dac7ef 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -9,7 +9,7 @@
  * Modified by Bill Fenner, PARC, April 1995
  *
  * MROUTING Revision: 3.5
- * $Id: ip_mroute.c,v 1.25 1995/11/14 20:34:16 phk Exp $
+ * $Id: ip_mroute.c,v 1.26 1995/12/02 19:38:03 bde Exp $
  */
 
 
@@ -72,7 +72,7 @@ extern int	_mrt_ioctl __P((int req, caddr_t data, struct proc *p));
 
 struct socket  *ip_mrouter  = NULL;
 static u_int		ip_mrtproto = 0;
-struct mrtstat	mrtstat;
+static struct mrtstat	mrtstat;
 u_int		rsvpdebug = 0;
 
 int
@@ -219,9 +219,9 @@ static int ip_mrtproto;
 #define NO_RTE_FOUND 	0x1
 #define RTE_FOUND	0x2
 
-struct mbuf    *mfctable[MFCTBLSIZ];
-u_char		nexpire[MFCTBLSIZ];
-struct vif	viftable[MAXVIFS];
+static struct mbuf    *mfctable[MFCTBLSIZ];
+static u_char		nexpire[MFCTBLSIZ];
+static struct vif	viftable[MAXVIFS];
 static u_int	mrtdebug = 0;	  /* debug level 	*/
 #define		DEBUG_MFC	0x02
 #define		DEBUG_FORWARD	0x04
@@ -238,7 +238,7 @@ static u_int	rsvpdebug = 0;	  /* rsvp debug level   */
  * tbftable -> each vif has one of these for storing info 
  */
 
-struct tbf tbftable[MAXVIFS];
+static struct tbf tbftable[MAXVIFS];
 #define		TBF_REPROCESS	(hz / 100)	/* 100x / second */
 
 /*
@@ -249,7 +249,7 @@ struct tbf tbftable[MAXVIFS];
  * can't be sent this way.  They only exist as a placeholder for
  * multicast source verification.
  */
-struct ifnet multicast_decap_if[MAXVIFS];
+static struct ifnet multicast_decap_if[MAXVIFS];
 
 #define ENCAP_TTL 64
 #define ENCAP_PROTO IPPROTO_IPIP	/* 4 */
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 15b5dbe48fc0..5b4a47039915 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.2 (Berkeley) 1/9/95
- *	$Id: ip_var.h,v 1.16 1995/11/14 20:34:21 phk Exp $
+ *	$Id: ip_var.h,v 1.17 1995/12/05 17:46:25 wollman Exp $
  */
 
 #ifndef _NETINET_IP_VAR_H_
@@ -169,7 +169,6 @@ void	 ip_freemoptions __P((struct ip_moptions *));
 void	 ip_init __P((void));
 extern int	 (*ip_mforward) __P((struct ip *, struct ifnet *, struct mbuf *,
 			  struct ip_moptions *));
-int	 ip_next_mtu __P((int, int));
 int	 ip_output __P((struct mbuf *,
 	    struct mbuf *, struct route *, int, struct ip_moptions *));
 void	 ip_slowtimo __P((void));
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index d208752c7e8c..ca50f689dc73 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.32 1995/11/09 20:23:02 phk Exp $
+ *	$Id: tcp_input.c,v 1.33 1995/11/14 20:34:37 phk Exp $
  */
 
 #ifndef TUBA_INCLUDE
@@ -65,7 +65,7 @@
 #include <netinet/tcpip.h>
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
-struct	tcpiphdr tcp_saveti;
+static struct	tcpiphdr tcp_saveti;
 #endif
 
 static int	tcprexmtthresh = 3;
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index d208752c7e8c..ca50f689dc73 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.32 1995/11/09 20:23:02 phk Exp $
+ *	$Id: tcp_input.c,v 1.33 1995/11/14 20:34:37 phk Exp $
  */
 
 #ifndef TUBA_INCLUDE
@@ -65,7 +65,7 @@
 #include <netinet/tcpip.h>
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
-struct	tcpiphdr tcp_saveti;
+static struct	tcpiphdr tcp_saveti;
 #endif
 
 static int	tcprexmtthresh = 3;
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index b15ff86bb1d5..807a1477ad69 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.16 1995/11/16 09:51:02 bde Exp $
+ *	$Id: udp_usrreq.c,v 1.17 1995/12/06 23:37:44 bde Exp $
  */
 
 #include <sys/param.h>
@@ -72,14 +72,14 @@ static int	udpcksum = 0;		/* XXX */
 SYSCTL_INT(_net_inet_udp, UDPCTL_CHECKSUM, checksum, CTLFLAG_RW,
 		&udpcksum, 0, "");
 
-struct	inpcbhead udb;		/* from udp_var.h */
-struct	inpcbinfo udbinfo;
+static struct	inpcbhead udb;		/* from udp_var.h */
+static struct	inpcbinfo udbinfo;
 
 #ifndef UDBHASHSIZE
 #define UDBHASHSIZE 64
 #endif
 
-struct	udpstat udpstat;	/* from udp_var.h */
+static struct	udpstat udpstat;	/* from udp_var.h */
 SYSCTL_STRUCT(_net_inet_udp, UDPCTL_STATS, stats, CTLFLAG_RD,
 	&udpstat, udpstat, "");