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>.

18 files changed, 81 insertions, 20 deletions

diff --git a/sys/i386/eisa/if_fea.c b/sys/i386/eisa/if_fea.c
index e993a2a..2cf06a0 100644
--- a/sys/i386/eisa/if_fea.c
+++ b/sys/i386/eisa/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/i386/eisa/if_vx_eisa.c b/sys/i386/eisa/if_vx_eisa.c
index 924cf81..8002b16 100644
--- a/sys/i386/eisa/if_vx_eisa.c
+++ b/sys/i386/eisa/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/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index 88619b8..d4d64e5 100644
--- a/sys/i386/isa/if_ar.c
+++ b/sys/i386/isa/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/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c
index 0c2b3a3..569209d 100644
--- a/sys/i386/isa/if_cx.c
+++ b/sys/i386/isa/if_cx.c
@@ -21,6 +21,11 @@
 #include "cx.h"
 #include "bpfilter.h"
 
+#include "sppp.h"
+#if NSPPP <= 0
+#error The device 'cx' requires sppp.
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 89a577f..3f72f96 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/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/i386/isa/if_eg.c b/sys/i386/isa/if_eg.c
index ae6966d..afe35c2 100644
--- a/sys/i386/isa/if_eg.c
+++ b/sys/i386/isa/if_eg.c
@@ -27,7 +27,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_eg.c,v 1.24 1997/07/20 14:09:57 bde Exp $
+ * $Id: if_eg.c,v 1.25 1997/09/02 01:18:09 bde Exp $
  *
  * Support for 3Com 3c505 Etherlink+ card.
  */
@@ -38,6 +38,7 @@
  */
 #include "eg.h"
 #include "bpfilter.h"
+#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,11 +49,12 @@
 #include <sys/socket.h>
 #include <sys/syslog.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/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 9fb5a17..7eeabd7 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -6,7 +6,7 @@
  *
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
- * $Id: if_el.c,v 1.31 1997/07/20 14:09:57 bde Exp $
+ * $Id: if_el.c,v 1.32 1997/12/15 20:30:40 eivind Exp $
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
@@ -21,6 +21,7 @@
  */
 #include "el.h"
 #include "bpfilter.h"
+#include "opt_inet.h"
 #include "opt_ipx.h"
 
 #include <sys/param.h>
@@ -31,7 +32,9 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 
+#include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index 5c55256..b4945e0 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/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/i386/isa/if_ex.c b/sys/i386/isa/if_ex.c
index 78500eb..566d884 100644
--- a/sys/i386/isa/if_ex.c
+++ b/sys/i386/isa/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/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 115b85e..32adfd2 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/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/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index daab501..5e2f30c 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/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/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 4bbfc7e..e8ca930 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.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_le.c,v 1.41 1997/08/25 22:28:57 bde Exp $
+ * $Id: if_le.c,v 1.42 1997/12/15 20:30:51 eivind Exp $
  */
 
 /*
@@ -37,6 +37,7 @@
 
 #include "le.h"
 #if NLE > 0
+#include "opt_inet.h"
 #include "opt_ipx.h"
 
 #include <sys/param.h>
@@ -47,7 +48,9 @@
 #include <sys/sockio.h>
 #include <sys/malloc.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/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index 24df453..71d9934 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/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/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c
index 604632f..c27467a 100644
--- a/sys/i386/isa/if_sr.c
+++ b/sys/i386/isa/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/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c
index 2073ef9..7ed1d4c 100644
--- a/sys/i386/isa/if_wl.c
+++ b/sys/i386/isa/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 */
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index 961dfeb..41d3277 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
  */
 
 /*
- * $Id: if_ze.c,v 1.46 1997/10/26 04:36:14 nate Exp $
+ * $Id: if_ze.c,v 1.47 1997/12/15 20:30:54 eivind Exp $
  */
 
 /* XXX - Don't mix different PCCARD support code */
@@ -64,6 +64,7 @@
 #include "ze.h"
 #if	NZE > 0
 #include "bpfilter.h"
+#include "opt_inet.h"
 #include "opt_ipx.h"
 
 #include <sys/param.h>
@@ -74,7 +75,9 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 
+#include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index b9e2933..5c155b1 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_zp.c,v 1.41 1997/11/07 09:20:28 phk Exp $
+ *	$Id: if_zp.c,v 1.42 1997/12/15 20:30:56 eivind Exp $
  */
 /*-
  * TODO:
@@ -114,6 +114,7 @@
 #include "zp.h"
 
 #include "bpfilter.h"
+#include "opt_inet.h"
 #include "opt_ipx.h"
 
 #include <sys/param.h>
@@ -126,7 +127,9 @@
 #include <sys/sockio.h>
 #include <sys/syslog.h>
 
+#include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index 735cc3e..399c69c 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.62 1997/09/02 01:18:18 bde Exp $
+ *	$Id: lpt.c,v 1.63 1997/12/02 21:06:24 phk Exp $
  */
 
 /*
@@ -102,6 +102,7 @@
  */
 
 #include "lpt.h"
+#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>