one extern seems to be better than 20 for ifqmaxlen; ok krw

14 files changed, 15 insertions, 34 deletions

diff --git a/sys/dev/pci/if_nx.c b/sys/dev/pci/if_nx.c
index b198e33859c..c34a29541a2 100644
--- a/sys/dev/pci/if_nx.c
+++ b/sys/dev/pci/if_nx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nx.c,v 1.46 2007/05/26 16:44:21 reyk Exp $	*/
+/*	$OpenBSD: if_nx.c,v 1.47 2007/05/26 17:13:30 jason Exp $	*/
 
 /*
  * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org>
@@ -303,8 +303,6 @@ const struct nxb_board {
 const u_int32_t nx_swportreg[NXSW_PORTREG_MAX][NX_MAX_PORTS] = NXSW_PORTREGS;
 #define NXSW_PORTREG(_p, _r)	(nx_swportreg[_r][nx->nx_port->nxp_id])
 
-extern int ifqmaxlen;
-
 /*
  * Routines handling the physical ''nxb'' board
  */
diff --git a/sys/dev/pci/if_vic.c b/sys/dev/pci/if_vic.c
index 20d5043e38f..a9e11f918de 100644
--- a/sys/dev/pci/if_vic.c
+++ b/sys/dev/pci/if_vic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vic.c,v 1.47 2007/05/04 05:08:55 deraadt Exp $	*/
+/*	$OpenBSD: if_vic.c,v 1.48 2007/05/26 17:13:30 jason Exp $	*/
 
 /*
  * Copyright (c) 2006 Reyk Floeter <reyk@openbsd.org>
@@ -343,8 +343,6 @@ const struct pci_matchid vic_devices[] = {
 	{ PCI_VENDOR_VMWARE, PCI_PRODUCT_VMWARE_NET }
 };
 
-extern int ifqmaxlen;
-
 int
 vic_match(struct device *parent, void *match, void *aux)
 {
diff --git a/sys/net/if.h b/sys/net/if.h
index ccc2b6cbb95..269a06ffe51 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.h,v 1.87 2007/03/27 11:22:59 jmc Exp $	*/
+/*	$OpenBSD: if.h,v 1.88 2007/05/26 17:13:30 jason Exp $	*/
 /*	$NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $	*/
 
 /*
@@ -674,6 +674,7 @@ do {									\
 #define	IFQ_INC_DROPS(ifq)		((ifq)->ifq_drops++)
 #define	IFQ_SET_MAXLEN(ifq, len)	((ifq)->ifq_maxlen = (len))
 
+extern int ifqmaxlen;
 extern struct ifnet_head ifnet;
 extern struct ifnet **ifindex2ifnet;
 extern struct ifnet *lo0ifp;
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index a59b13e8597..32c17b9e1c8 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bridge.c,v 1.161 2007/05/21 13:33:35 markus Exp $	*/
+/*	$OpenBSD: if_bridge.c,v 1.162 2007/05/26 17:13:30 jason Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -108,8 +108,6 @@
 #define	BRIDGE_RTABLE_TIMEOUT	240
 #endif
 
-extern int ifqmaxlen;
-
 void	bridgeattach(int);
 int	bridge_ioctl(struct ifnet *, u_long, caddr_t);
 void	bridge_start(struct ifnet *);
diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c
index d45f3f37cb7..cec5ca413c6 100644
--- a/sys/net/if_enc.c
+++ b/sys/net/if_enc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_enc.c,v 1.45 2006/12/12 15:08:36 reyk Exp $	*/
+/*	$OpenBSD: if_enc.c,v 1.46 2007/05/26 17:13:30 jason Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
@@ -79,8 +79,6 @@ int	encoutput(struct ifnet *, struct mbuf *, struct sockaddr *,
 int	encioctl(struct ifnet *, u_long, caddr_t);
 void	encstart(struct ifnet *);
 
-extern int ifqmaxlen;
-
 void
 encattach(int nenc)
 {
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index 779c823df36..3cab3a6badf 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_gif.c,v 1.44 2007/05/21 13:33:35 markus Exp $	*/
+/*	$OpenBSD: if_gif.c,v 1.45 2007/05/26 17:13:30 jason Exp $	*/
 /*	$KAME: if_gif.c,v 1.43 2001/02/20 08:51:07 itojun Exp $	*/
 
 /*
@@ -64,8 +64,6 @@
 #include "bpfilter.h"
 #include "bridge.h"
 
-extern int ifqmaxlen;
-
 void	gifattach(int);
 int	gif_clone_create(struct if_clone *, int);
 int	gif_clone_destroy(struct ifnet *);
diff --git a/sys/net/if_pflog.c b/sys/net/if_pflog.c
index fe6d72b54e5..56907c3d4a7 100644
--- a/sys/net/if_pflog.c
+++ b/sys/net/if_pflog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pflog.c,v 1.23 2007/03/19 09:40:13 henning Exp $	*/
+/*	$OpenBSD: if_pflog.c,v 1.24 2007/05/26 17:13:30 jason Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
@@ -87,8 +87,6 @@ struct if_clone	pflog_cloner =
 
 struct ifnet	*pflogifs[PFLOGIFS_MAX];	/* for fast access */
 
-extern int ifqmaxlen;
-
 void
 pflogattach(int npflog)
 {
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index 11063397e3e..a106049d24e 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pfsync.c,v 1.73 2006/11/16 13:13:38 henning Exp $	*/
+/*	$OpenBSD: if_pfsync.c,v 1.74 2007/05/26 17:13:31 jason Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff
@@ -106,7 +106,6 @@ void	pfsync_bulk_update(void *);
 void	pfsync_bulkfail(void *);
 
 int	pfsync_sync_ok;
-extern int ifqmaxlen;
 
 struct if_clone	pfsync_cloner =
     IF_CLONE_INITIALIZER("pfsync", pfsync_clone_create, pfsync_clone_destroy);
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 0b586929c97..e73a3a916ec 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.c,v 1.48 2007/04/11 14:50:55 claudio Exp $	*/
+/*	$OpenBSD: if_ppp.c,v 1.49 2007/05/26 17:13:31 jason Exp $	*/
 /*	$NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $	*/
 
 /*
@@ -230,7 +230,6 @@ ppp_clone_create(ifc, unit)
     struct if_clone *ifc;
     int unit;
 {
-    extern int ifqmaxlen;
     struct ppp_softc *sc;
     int s;
 
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c
index f76fcdfe52a..2762e13256e 100644
--- a/sys/net/if_trunk.c
+++ b/sys/net/if_trunk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_trunk.c,v 1.31 2007/04/26 08:57:59 reyk Exp $	*/
+/*	$OpenBSD: if_trunk.c,v 1.32 2007/05/26 17:13:31 jason Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
@@ -60,7 +60,6 @@
 SLIST_HEAD(__trhead, trunk_softc) trunk_list;	/* list of trunks */
 
 extern struct ifaddr **ifnet_addrs;
-extern int ifqmaxlen;
 
 void	 trunkattach(int);
 int	 trunk_clone_create(struct if_clone *, int);
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index d2003e1c65d..c262e366bb3 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tun.c,v 1.87 2007/05/26 00:36:03 krw Exp $	*/
+/*	$OpenBSD: if_tun.c,v 1.88 2007/05/26 17:13:31 jason Exp $	*/
 /*	$NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $	*/
 
 /*
@@ -114,8 +114,6 @@ int	tundebug = TUN_DEBUG;
 /* Only these IFF flags are changeable by TUNSIFINFO */
 #define TUN_IFF_FLAGS (IFF_UP|IFF_POINTOPOINT|IFF_MULTICAST|IFF_BROADCAST)
 
-extern int ifqmaxlen;
-
 void	tunattach(int);
 int	tunopen(dev_t, int, int, struct proc *);
 int	tunclose(dev_t, int, int, struct proc *);
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index d8c4c99ccfa..89ee80f6728 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vlan.c,v 1.68 2006/05/22 23:25:15 krw Exp $	*/
+/*	$OpenBSD: if_vlan.c,v 1.69 2007/05/26 17:13:31 jason Exp $	*/
 
 /*
  * Copyright 1998 Massachusetts Institute of Technology
@@ -78,7 +78,6 @@
 #include <net/if_vlan_var.h>
 
 extern struct	ifaddr	**ifnet_addrs;
-extern int ifqmaxlen;
 u_long vlan_tagmask;
 
 #define TAG_HASH_SIZE	32
diff --git a/sys/netbt/hci_raw.c b/sys/netbt/hci_raw.c
index 0feb03763a5..2f3e52b1681 100644
--- a/sys/netbt/hci_raw.c
+++ b/sys/netbt/hci_raw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hci_raw.c,v 1.4 2006/03/04 22:40:16 brad Exp $	*/
+/*	$OpenBSD: hci_raw.c,v 1.5 2007/05/26 17:13:31 jason Exp $	*/
 
 /*
  * ng_btsocket_hci_raw.c
@@ -105,7 +105,6 @@ static struct ng_type typestruct = {
 #endif
 
 /* Globals */
-extern int					ifqmaxlen;
 static u_int32_t				ng_btsocket_hci_raw_debug_level;
 static u_int32_t				ng_btsocket_hci_raw_ioctl_timeout;
 #if 0
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 0897483fbd5..9130121cdde 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_carp.c,v 1.137 2007/05/06 12:20:04 henning Exp $	*/
+/*	$OpenBSD: ip_carp.c,v 1.138 2007/05/26 17:13:31 jason Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -820,7 +820,6 @@ carp_clone_create(ifc, unit)
 	struct if_clone *ifc;
 	int unit;
 {
-	extern int ifqmaxlen;
 	struct carp_softc *sc;
 	struct ifnet *ifp;