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

1 files changed, 8 insertions, 2 deletions

diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index c263d84..6d9318e 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -17,6 +17,8 @@
 #include "tun.h"
 #if NTUN > 0
 
+#include "opt_inet.h"
+
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
@@ -233,7 +235,8 @@ tuninit(unit)
 	microtime(&ifp->if_lastchange);
 
 	for (ifa = ifp->if_addrhead.tqh_first; ifa; 
-	     ifa = ifa->ifa_link.tqe_next)
+	     ifa = ifa->ifa_link.tqe_next) {
+#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET) {
 		    struct sockaddr_in *si;
 
@@ -245,7 +248,8 @@ tuninit(unit)
 		    if (si && si->sin_addr.s_addr)
 			    tp->tun_flags |= TUN_DSTADDR;
 		}
-
+#endif
+	}
 	return 0;
 }
 
@@ -574,6 +578,7 @@ tunwrite(dev, uio, flag)
 	}
 #endif
 
+#ifdef INET
 	s = splimp();
 	if (IF_QFULL (&ipintrq)) {
 		IF_DROP(&ipintrq);
@@ -587,6 +592,7 @@ tunwrite(dev, uio, flag)
 	ifp->if_ibytes += tlen;
 	ifp->if_ipackets++;
 	schednetisr(NETISR_IP);
+#endif
 	return error;
 }