Make INET a proper option.

This will not make any of object files that LINT create change; there
might be differences with INET disabled, but hardly anything compiled
before without INET anyway.  Now the 'obvious' things will give a
proper error if compiled without inet - ipx_ip, ipfw, tcp_debug.  The
only thing that _should_ work (but can't be made to compile reasonably
easily) is sppp :-(

This commit move struct arpcom from <netinet/if_ether.h> to
<net/if_arp.h>.

20 files changed, 95 insertions, 26 deletions

diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 88619b8..d4d64e5 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.15 1997/05/19 22:02:47 joerg Exp $
+ * $Id: if_ar.c,v 1.16 1997/09/02 01:18:04 bde Exp $
  */
 
 /*
@@ -73,6 +73,12 @@
 
 #include "ioconf.h"
 
+#include "sppp.h"
+#if NSPPP <= 0
+#error device 'ar' require sppp.
+#endif
+
+
 #ifdef TRACE
 #define TRC(x)               x
 #else
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 88619b8..d4d64e5 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.15 1997/05/19 22:02:47 joerg Exp $
+ * $Id: if_ar.c,v 1.16 1997/09/02 01:18:04 bde Exp $
  */
 
 /*
@@ -73,6 +73,12 @@
 
 #include "ioconf.h"
 
+#include "sppp.h"
+#if NSPPP <= 0
+#error device 'ar' require sppp.
+#endif
+
+
 #ifdef TRACE
 #define TRC(x)               x
 #else
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index f94d42f..a822ea4 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.56 1997/10/20 14:32:46 matt Exp $	*/
-/*	$Id: if_de.c,v 1.75 1997/11/22 06:45:57 bde Exp $ */
+/*	$Id: if_de.c,v 1.76 1997/12/15 20:31:25 eivind Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -39,6 +39,7 @@
  */
 #define	TULIP_HDR_DATA
 
+#include "opt_inet.h"
 #include "opt_ipx.h"
 
 #include <sys/param.h>
@@ -82,6 +83,7 @@
 
 #ifdef INET
 #include <netinet/in.h>
+#include <netinet/if_ether.h>
 #endif
 
 #ifdef IPX
@@ -99,7 +101,8 @@
 #if defined(__FreeBSD__)
 #include <vm/pmap.h>
 #include <pci.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
+#include <net/if_arp.h>
 #if NPCI > 0
 #include <pci/pcivar.h>
 #include <pci/dc21040reg.h>
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 89a577f..3f72f96 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.128 1997/11/07 08:52:33 phk Exp $
+ *	$Id: if_ed.c,v 1.129 1997/11/20 15:48:27 nate Exp $
  */
 
 /*
@@ -39,6 +39,7 @@
 
 #include "ed.h"
 #include "bpfilter.h"
+#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,13 +50,14 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 
+#include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_mib.h>
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
 #endif
 
 #ifdef NS
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index b1bb5ab..6c9ac73 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -89,6 +89,7 @@
 
 #ifdef __FreeBSD__
 #include "en.h"
+#include "opt_inet.h"
 #endif
 
 #if NEN > 0 || !defined(__FreeBSD__)
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 5c55256..b4945e0 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.68 1997/11/27 12:59:46 kato Exp $
+ *  $Id: if_ep.c,v 1.69 1997/12/15 20:30:43 eivind Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -60,6 +60,7 @@
 #if NEP > 0
 
 #include "bpfilter.h"
+#include "opt_inet.h"
 #include "opt_ipx.h"
 
 #include <sys/param.h>
@@ -78,6 +79,11 @@
 
 #include <net/if.h>
 
+#if defined(__FreeBSD__)
+#include <net/ethernet.h>
+#include <net/if_arp.h>
+#endif
+
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 78500eb..566d884 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ex.c,v 1.8 1997/11/07 08:52:38 phk Exp $
+ *	$Id: if_ex.c,v 1.9 1997/12/15 20:30:45 eivind Exp $
  */
 
 /*
@@ -38,6 +38,7 @@
 #include "ex.h"
 #if NEX > 0
 #include "bpfilter.h"
+#include "opt_inet.h"
 #include "opt_ipx.h"
 
 #include <sys/param.h>
@@ -47,7 +48,9 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
+#include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 115b85e..32adfd2 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.35 1997/11/20 15:48:35 nate Exp $
+ * $Id: if_fe.c,v 1.36 1997/12/15 20:30:47 eivind Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -72,6 +72,7 @@
 
 #include "fe.h"
 #include "bpfilter.h"
+#include "opt_inet.h"
 #include "opt_ipx.h"
 
 #include <sys/param.h>
@@ -85,7 +86,9 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 
+#include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 #include <net/if_dl.h>
 
 #ifdef INET
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index ef3284f..ef0a280 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.45 1997/10/23 01:45:15 davidg Exp $
+ *	$Id: if_fxp.c,v 1.46 1997/10/28 15:59:21 bde Exp $
  */
 
 /*
@@ -35,6 +35,7 @@
  */
 
 #include "bpfilter.h"
+#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,6 +50,7 @@
 
 #ifdef INET
 #include <netinet/in.h>
+#include <netinet/if_ether.h>
 #endif
 
 #ifdef NS
@@ -94,7 +96,8 @@
 
 #include <sys/sockio.h>
 
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
+#include <net/if_arp.h>
 
 #include <vm/vm.h>		/* for vtophys */
 #include <vm/pmap.h>		/* for vtophys */
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index daab501..5e2f30c 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.47 1997/10/15 10:09:24 joerg Exp $
+ *	$Id: if_ie.c,v 1.48 1997/12/15 20:30:49 eivind Exp $
  */
 
 /*
@@ -108,6 +108,7 @@ iomem and and with 0xffff.
 
 #include "ie.h"
 #if NIE > 0
+#include "opt_inet.h"
 #include "opt_ipx.h"
 
 #include <sys/param.h>
@@ -120,7 +121,9 @@ iomem and and with 0xffff.
 #include <sys/sockio.h>
 #include <sys/syslog.h>
 
+#include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
 
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 24df453..71d9934 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -65,6 +65,7 @@
 #if NLNC > 0
 
 #include "bpfilter.h"
+#include "opt_inet.h"
 
 /* Some defines that should really be in generic locations */
 #define FCS_LEN 4
@@ -79,7 +80,9 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 
+#include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 #include <net/if_types.h>
 #ifdef INET
 #include <netinet/in.h>
@@ -96,7 +99,7 @@
 #include <i386/isa/if_lnc.h>
 
 struct lnc_softc {
-	struct arpcom arpcom;	            /* see ../../netinet/if_ether.h */
+	struct arpcom arpcom;	            /* see ../../net/if_arp.h */
 	struct nic_info nic;	            /* NIC specific info */
 	int nrdre;
 	struct host_ring_entry *recv_ring;  /* start of alloc'd mem */
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index e993a2a..2cf06a0 100644
--- a/sys/dev/pdq/if_fea.c
+++ b/sys/dev/pdq/if_fea.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fea.c,v 1.6 1997/09/14 11:28:30 peter Exp $
+ * $Id: if_fea.c,v 1.7 1997/09/21 21:35:24 gibbs Exp $
  */
 
 /*
@@ -30,6 +30,7 @@
  *	This module support the DEFEA EISA FDDI Controller.
  */
 
+#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -38,11 +39,12 @@
 #include <sys/device.h>
 #endif
 
+#include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
 #endif
 
 #if defined(__FreeBSD__)
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 0dab356..b0b38f0 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fpa.c,v 1.3 1997/03/24 11:24:51 bde Exp $
+ * $Id: if_fpa.c,v 1.4 1997/08/02 14:33:10 bde Exp $
  *
  */
 
@@ -31,6 +31,7 @@
  *   This module supports the DEC DEFPA PCI FDDI Controller
  */
 
+#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -48,6 +49,8 @@
 
 #if defined(__FreeBSD__)
 #include "fpa.h"
+#include <net/ethernet.h>
+#include <net/if_arp.h>
 #include <pci/pcivar.h>
 #include <dev/pdq/pdqvar.h>
 #include <dev/pdq/pdqreg.h>
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 33a6b7a..9c13a00 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdq_ifsubr.c,v 1.4 1997/03/24 11:32:26 bde Exp $
+ * $Id: pdq_ifsubr.c,v 1.5 1997/06/14 13:56:07 bde Exp $
  *
  */
 
@@ -33,6 +33,8 @@
  */
 
 
+#include "opt_inet.h"
+
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
@@ -48,11 +50,13 @@
 #include <net/bpf.h>
 #endif
 
+#if defined(__FreeBSD__)
+#include <net/ethernet.h>
+#include <net/if_arp.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 #endif
-#if defined(__FreeBSD__)
 #include <netinet/if_fddi.h>
 #else
 #include <net/if_fddi.h>
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 604632f..c27467a 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.8 1997/07/20 14:10:01 bde Exp $
+ * $Id: if_sr.c,v 1.9 1997/09/02 01:18:16 bde Exp $
  */
 
 /*
@@ -55,6 +55,11 @@
 #endif
 #include "bpfilter.h"
 
+#include "sppp.h"
+#if NSPPP <= 0
+#error Device 'sr' requires sppp.
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 604632f..c27467a 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.8 1997/07/20 14:10:01 bde Exp $
+ * $Id: if_sr.c,v 1.9 1997/09/02 01:18:16 bde Exp $
  */
 
 /*
@@ -55,6 +55,11 @@
 #endif
 #include "bpfilter.h"
 
+#include "sppp.h"
+#if NSPPP <= 0
+#error Device 'sr' requires sppp.
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 420e6c1..47367ac 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -61,6 +61,7 @@
 #endif
 
 #include "bpfilter.h"
+#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,10 +72,8 @@
 
 #include <net/if.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#endif
+#include <net/ethernet.h>
+#include <net/if_arp.h>
 
 #ifdef NS
 #include <netns/ns.h>
diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c
index 924cf81..8002b16 100644
--- a/sys/dev/vx/if_vx_eisa.c
+++ b/sys/dev/vx/if_vx_eisa.c
@@ -34,16 +34,19 @@
 #include "vx.h"
 #if NVX > 0
 
+#include "opt_inet.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 
+#include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
 #endif
 
 #ifdef NS
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index b667b89..bce0de9 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -33,19 +33,23 @@
 
 #include "vx.h"
 #if NVX > 0
+#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 
+#include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 #endif
 
+
 #ifdef NS
 #include <netns/ns.h>
 #include <netns/ns_if.h>
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 2073ef9..7ed1d4c 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.8 1997/08/25 22:34:25 bde Exp $ */
+/* $Id: if_wl.c,v 1.9 1997/09/21 21:41:13 gibbs Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -191,6 +191,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "wl.h"
 #include "opt_wavelan.h"
 #include "bpfilter.h"
+#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -203,7 +204,9 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 
+#include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 #include <net/if_dl.h>
 
 #ifdef INET
@@ -2581,6 +2584,7 @@ void wl_cache_store (int unit, int base, struct ether_header *eh,
 	 * keep multicast only.
 	 */
  
+#ifdef INET
 	/* reject if not IP packet
 	*/
 	if ( wl_cache_iponly && (ntohs(eh->ether_type) != 0x800)) {
@@ -2676,6 +2680,7 @@ void wl_cache_store (int unit, int base, struct ether_header *eh,
 			signal - silence;
 	else
 		sc->w_sigcache[w_insertcache].snr = 0;
+#endif /* INET */
 
 }
 #endif /* WLCACHE */