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

4 files changed, 18 insertions, 5 deletions

diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index f94d42f..a822ea4 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/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/pci/if_fpa.c b/sys/pci/if_fpa.c
index 0dab356..b0b38f0 100644
--- a/sys/pci/if_fpa.c
+++ b/sys/pci/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/pci/if_fxp.c b/sys/pci/if_fxp.c
index ef3284f..ef0a280 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/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/pci/if_vx_pci.c b/sys/pci/if_vx_pci.c
index b667b89..bce0de9 100644
--- a/sys/pci/if_vx_pci.c
+++ b/sys/pci/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>