unifdef INET

63 files changed, 63 insertions, 259 deletions

diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c
index b3083a86ce1..a69585b548d 100644
--- a/sys/dev/pci/if_age.c
+++ b/sys/dev/pci/if_age.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_age.c,v 1.24 2014/11/18 02:37:30 tedu Exp $	*/
+/*	$OpenBSD: if_age.c,v 1.25 2014/12/22 02:28:51 tedu Exp $	*/
 
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -50,10 +50,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
@@ -1052,10 +1050,8 @@ age_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			 age_init(ifp);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c
index a38a3192c71..44ca6539687 100644
--- a/sys/dev/pci/if_alc.c
+++ b/sys/dev/pci/if_alc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_alc.c,v 1.29 2014/11/27 14:52:04 brad Exp $	*/
+/*	$OpenBSD: if_alc.c,v 1.30 2014/12/22 02:28:51 tedu Exp $	*/
 /*-
  * Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -49,10 +49,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
@@ -1460,10 +1458,8 @@ alc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			alc_init(ifp);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index 5bf134058e9..dbd33fe091a 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ale.c,v 1.34 2014/11/27 14:52:04 brad Exp $	*/
+/*	$OpenBSD: if_ale.c,v 1.35 2014/12/22 02:28:51 tedu Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -52,11 +52,9 @@
 #include <net/if_llc.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
@@ -1084,10 +1082,8 @@ ale_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			ale_init(ifp);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_ath_pci.c b/sys/dev/pci/if_ath_pci.c
index c0161acc589..4756c8ae188 100644
--- a/sys/dev/pci/if_ath_pci.c
+++ b/sys/dev/pci/if_ath_pci.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_ath_pci.c,v 1.23 2013/11/21 16:16:08 mpi Exp $   */
+/*      $OpenBSD: if_ath_pci.c,v 1.24 2014/12/22 02:28:51 tedu Exp $   */
 /*	$NetBSD: if_ath_pci.c,v 1.7 2004/06/30 05:58:17 mycroft Exp $	*/
 
 /*-
@@ -55,10 +55,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_rssadapt.h>
diff --git a/sys/dev/pci/if_atw_pci.c b/sys/dev/pci/if_atw_pci.c
index 615939aee47..f95e3eacb68 100644
--- a/sys/dev/pci/if_atw_pci.c
+++ b/sys/dev/pci/if_atw_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atw_pci.c,v 1.16 2014/12/19 22:44:58 guenther Exp $	*/
+/*	$OpenBSD: if_atw_pci.c,v 1.17 2014/12/22 02:28:51 tedu Exp $	*/
 /*	$NetBSD: if_atw_pci.c,v 1.7 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*-
@@ -51,10 +51,8 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_radiotap.h>
 #include <net80211/ieee80211_var.h>
diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c
index 3222eebd6db..537353a8b93 100644
--- a/sys/dev/pci/if_bce.c
+++ b/sys/dev/pci/if_bce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bce.c,v 1.39 2014/12/08 16:21:38 brad Exp $ */
+/* $OpenBSD: if_bce.c,v 1.40 2014/12/22 02:28:51 tedu Exp $ */
 /* $NetBSD: if_bce.c,v 1.3 2003/09/29 01:53:02 mrg Exp $	 */
 
 /*
@@ -51,10 +51,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
@@ -473,12 +471,10 @@ bce_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 
 		switch (ifa->ifa_addr->sa_family) {
-#ifdef INET
 		case AF_INET:
 			bce_init(ifp);
 			arp_ifinit(&sc->bce_ac, ifa);
 			break;
-#endif /* INET */
 		default:
 			bce_init(ifp);
 			break;
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index da27a4bf94f..64ca46bc854 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bge.c,v 1.361 2014/09/02 10:14:55 brad Exp $	*/
+/*	$OpenBSD: if_bge.c,v 1.362 2014/12/22 02:28:51 tedu Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -89,10 +89,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #if NVLAN > 0
 #include <net/if_types.h>
@@ -4456,10 +4454,8 @@ bge_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			bge_init(sc);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->arpcom, ifa);
-#endif /* INET */
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c
index ce035556ef4..10317ebaf18 100644
--- a/sys/dev/pci/if_bnx.c
+++ b/sys/dev/pci/if_bnx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bnx.c,v 1.107 2014/07/18 07:11:04 dlg Exp $	*/
+/*	$OpenBSD: if_bnx.c,v 1.108 2014/12/22 02:28:51 tedu Exp $	*/
 
 /*-
  * Copyright (c) 2006 Broadcom Corporation
@@ -5092,10 +5092,8 @@ bnx_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			bnx_init(sc);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->arpcom, ifa);
-#endif /* INET */
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c
index 42f54369ef6..bedb32c3025 100644
--- a/sys/dev/pci/if_cas.c
+++ b/sys/dev/pci/if_cas.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cas.c,v 1.36 2014/12/19 22:44:58 guenther Exp $	*/
+/*	$OpenBSD: if_cas.c,v 1.37 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  *
@@ -61,10 +61,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
@@ -1683,10 +1681,8 @@ cas_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if ((ifp->if_flags & IFF_RUNNING) == 0)
 			cas_init(ifp);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_dc_pci.c b/sys/dev/pci/if_dc_pci.c
index 20a93db08d3..306cb28a4a9 100644
--- a/sys/dev/pci/if_dc_pci.c
+++ b/sys/dev/pci/if_dc_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_dc_pci.c,v 1.70 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: if_dc_pci.c,v 1.71 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -52,10 +52,8 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_media.h>
 
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 712342218b1..af82b484c04 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.116 2014/09/08 06:24:13 jsg Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.117 2014/12/22 02:28:52 tedu Exp $	*/
 /*	$NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $	*/
 
 /*-
@@ -4173,12 +4173,10 @@ tulip_ifioctl(struct ifnet * ifp, u_long cmd, caddr_t data)
 	ifp->if_flags |= IFF_UP;
 	tulip_init(sc);
 	switch(ifa->ifa_addr->sa_family) {
-#ifdef INET
 	case AF_INET: {
 	    arp_ifinit(&sc->tulip_ac, ifa);
 	    break;
 	}
-#endif /* INET */
 
 	default: {
 	    break;
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index dcf4da9c6cb..afb71f4e24b 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_em.c,v 1.289 2014/11/19 23:47:22 brad Exp $ */
+/* $OpenBSD: if_em.c,v 1.290 2014/12/22 02:28:52 tedu Exp $ */
 /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
 
 #include <dev/pci/if_em.h>
@@ -667,10 +667,8 @@ em_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 			ifp->if_flags |= IFF_UP;
 			em_init(sc);
 		}
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->interface_data, ifa);
-#endif /* INET */
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c
index 6c1e170661f..16cd3ee9136 100644
--- a/sys/dev/pci/if_em_hw.c
+++ b/sys/dev/pci/if_em_hw.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/* $OpenBSD: if_em_hw.c,v 1.81 2014/11/05 15:30:17 claudio Exp $ */
+/* $OpenBSD: if_em_hw.c,v 1.82 2014/12/22 02:28:52 tedu Exp $ */
 /*
  * if_em_hw.c Shared functions for accessing and configuring the MAC
  */
@@ -49,10 +49,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c
index 1fb020b9055..032fe8c675c 100644
--- a/sys/dev/pci/if_ep_pci.c
+++ b/sys/dev/pci/if_ep_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_pci.c,v 1.30 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: if_ep_pci.c,v 1.31 2014/12/22 02:28:52 tedu Exp $	*/
 /*	$NetBSD: if_ep_pci.c,v 1.13 1996/10/21 22:56:38 thorpej Exp $	*/
 
 /*
@@ -49,10 +49,8 @@
 #include <net/if_types.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
  
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/dev/pci/if_epic_pci.c b/sys/dev/pci/if_epic_pci.c
index 4e8ad359983..afd730e4c6f 100644
--- a/sys/dev/pci/if_epic_pci.c
+++ b/sys/dev/pci/if_epic_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_epic_pci.c,v 1.13 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: if_epic_pci.c,v 1.14 2014/12/22 02:28:52 tedu Exp $	*/
 /*	$NetBSD: if_epic_pci.c,v 1.28 2005/02/27 00:27:32 perry Exp $	*/
 
 /*-
@@ -50,10 +50,8 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_media.h>
 
diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c
index 080f1809ec8..1d8df6fc4c4 100644
--- a/sys/dev/pci/if_et.c
+++ b/sys/dev/pci/if_et.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_et.c,v 1.24 2014/08/30 09:52:13 brad Exp $	*/
+/*	$OpenBSD: if_et.c,v 1.25 2014/12/22 02:28:52 tedu Exp $	*/
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
  * 
@@ -56,10 +56,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
@@ -1021,10 +1019,8 @@ et_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			et_init(ifp);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c
index f70dcbf730c..47528f2b413 100644
--- a/sys/dev/pci/if_fxp_pci.c
+++ b/sys/dev/pci/if_fxp_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fxp_pci.c,v 1.62 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: if_fxp_pci.c,v 1.63 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 1995, David Greenman
@@ -52,9 +52,7 @@
 #include <net/if_media.h>
 #include <net/if_types.h>
 
-#ifdef INET
 #include <netinet/in.h>
-#endif
 
 #include <sys/ioctl.h>
 #include <sys/errno.h>
diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c
index d6d436c93f6..c01a1a3c2c9 100644
--- a/sys/dev/pci/if_gem_pci.c
+++ b/sys/dev/pci/if_gem_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_gem_pci.c,v 1.35 2014/12/19 22:44:58 guenther Exp $	*/
+/*	$OpenBSD: if_gem_pci.c,v 1.36 2014/12/22 02:28:52 tedu Exp $	*/
 /*	$NetBSD: if_gem_pci.c,v 1.1 2001/09/16 00:11:42 eeh Exp $ */
 
 /*
@@ -47,10 +47,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <machine/bus.h>
 #include <machine/intr.h>
diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c
index ed3b0793ac3..d9525ea3842 100644
--- a/sys/dev/pci/if_hme_pci.c
+++ b/sys/dev/pci/if_hme_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_hme_pci.c,v 1.18 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: if_hme_pci.c,v 1.19 2014/12/22 02:28:52 tedu Exp $	*/
 /*	$NetBSD: if_hme_pci.c,v 1.3 2000/12/28 22:59:13 sommerfeld Exp $	*/
 
 /*
@@ -44,10 +44,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 78dae1db277..690f6bcf034 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ipw.c,v 1.104 2014/12/19 22:44:58 guenther Exp $	*/
+/*	$OpenBSD: if_ipw.c,v 1.105 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*-
  * Copyright (c) 2004-2008
@@ -1395,10 +1395,8 @@ ipw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	case SIOCSIFADDR:
 		ifa = (struct ifaddr *)data;
 		ifp->if_flags |= IFF_UP;
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&ic->ic_ac, ifa);
-#endif
 		/* FALLTHROUGH */
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index 01d58612383..8a4d748cf61 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwi.c,v 1.120 2014/12/19 22:44:58 guenther Exp $	*/
+/*	$OpenBSD: if_iwi.c,v 1.121 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*-
  * Copyright (c) 2004-2008
@@ -1490,10 +1490,8 @@ iwi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	case SIOCSIFADDR:
 		ifa = (struct ifaddr *)data;
 		ifp->if_flags |= IFF_UP;
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&ic->ic_ac, ifa);
-#endif
 		/* FALLTHROUGH */
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index 4b63190ecbf..5a5cdd0fcde 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwn.c,v 1.136 2014/12/19 22:44:58 guenther Exp $	*/
+/*	$OpenBSD: if_iwn.c,v 1.137 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -3144,10 +3144,8 @@ iwn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	case SIOCSIFADDR:
 		ifa = (struct ifaddr *)data;
 		ifp->if_flags |= IFF_UP;
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&ic->ic_ac, ifa);
-#endif
 		/* FALLTHROUGH */
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c
index 34ead4aba1c..cf1539c1a42 100644
--- a/sys/dev/pci/if_ix.c
+++ b/sys/dev/pci/if_ix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ix.c,v 1.112 2014/12/13 21:05:33 doug Exp $	*/
+/*	$OpenBSD: if_ix.c,v 1.113 2014/12/22 02:28:52 tedu Exp $	*/
 
 /******************************************************************************
 
@@ -435,10 +435,8 @@ ixgbe_ioctl(struct ifnet * ifp, u_long command, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			ixgbe_init(sc);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_ixgb.c b/sys/dev/pci/if_ixgb.c
index cac1a736a66..9d238f3a9c2 100644
--- a/sys/dev/pci/if_ixgb.c
+++ b/sys/dev/pci/if_ixgb.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_ixgb.c,v 1.62 2014/07/13 23:10:23 deraadt Exp $ */
+/* $OpenBSD: if_ixgb.c,v 1.63 2014/12/22 02:28:52 tedu Exp $ */
 
 #include <dev/pci/if_ixgb.h>
 
@@ -344,10 +344,8 @@ ixgb_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			ixgb_init(sc);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->interface_data, ifa);
-#endif /* INET */
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index 90b70d05687..d84d9f321cc 100644
--- a/sys/dev/pci/if_jme.c
+++ b/sys/dev/pci/if_jme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_jme.c,v 1.36 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: if_jme.c,v 1.37 2014/12/22 02:28:52 tedu Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -50,10 +50,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
@@ -1329,10 +1327,8 @@ jme_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			jme_init(ifp);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c
index 164e367f9e6..1db8b765567 100644
--- a/sys/dev/pci/if_lge.c
+++ b/sys/dev/pci/if_lge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lge.c,v 1.63 2014/08/20 01:00:15 dlg Exp $	*/
+/*	$OpenBSD: if_lge.c,v 1.64 2014/12/22 02:28:52 tedu Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -89,10 +89,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
@@ -1176,10 +1174,8 @@ lge_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			lge_init(sc);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->arpcom, ifa);
-#endif /* INET */
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_lii.c b/sys/dev/pci/if_lii.c
index df3ac451d9e..c1af55c6b24 100644
--- a/sys/dev/pci/if_lii.c
+++ b/sys/dev/pci/if_lii.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lii.c,v 1.33 2014/08/30 09:52:13 brad Exp $	*/
+/*	$OpenBSD: if_lii.c,v 1.34 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  *  Copyright (c) 2007 The NetBSD Foundation.
@@ -53,10 +53,8 @@
 #include <net/bpf.h>
 #endif
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
@@ -1085,10 +1083,8 @@ lii_ioctl(struct ifnet *ifp, u_long cmd, caddr_t addr)
 	switch(cmd) {
 	case SIOCSIFADDR:
 		SET(ifp->if_flags, IFF_UP);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_ac, ifa);
-#endif
 		/* FALLTHROUGH */
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index fdc9c4aab4a..8b50516ecb3 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_msk.c,v 1.111 2014/11/24 23:28:50 brad Exp $	*/
+/*	$OpenBSD: if_msk.c,v 1.112 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -103,10 +103,8 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_media.h>
 #include <net/if_vlan_var.h>
@@ -593,10 +591,8 @@ msk_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			msk_init(sc_if);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc_if->arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_mtd_pci.c b/sys/dev/pci/if_mtd_pci.c
index 09bb1021914..c46fca532a9 100644
--- a/sys/dev/pci/if_mtd_pci.c
+++ b/sys/dev/pci/if_mtd_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mtd_pci.c,v 1.10 2005/08/09 04:10:12 mickey Exp $	*/
+/*	$OpenBSD: if_mtd_pci.c,v 1.11 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 2003 Oleg Safiullin <form@pdp11.org.ru>
@@ -36,10 +36,8 @@
 #include <net/if.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <machine/bus.h>
 
diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c
index 06d5524d039..fd750c68b42 100644
--- a/sys/dev/pci/if_myx.c
+++ b/sys/dev/pci/if_myx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_myx.c,v 1.71 2014/10/28 00:36:06 dlg Exp $	*/
+/*	$OpenBSD: if_myx.c,v 1.72 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org>
@@ -47,10 +47,8 @@
 #include <net/bpf.h>
 #endif
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
@@ -924,10 +922,8 @@ myx_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	switch (cmd) {
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_ac, ifa);
-#endif
 		/* FALLTHROUGH */
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_ne_pci.c b/sys/dev/pci/if_ne_pci.c
index 07d33867a7d..744a9fa92a6 100644
--- a/sys/dev/pci/if_ne_pci.c
+++ b/sys/dev/pci/if_ne_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_pci.c,v 1.19 2014/11/24 02:03:37 brad Exp $	*/
+/*	$OpenBSD: if_ne_pci.c,v 1.20 2014/12/22 02:28:52 tedu Exp $	*/
 /*	$NetBSD: if_ne_pci.c,v 1.8 1998/07/05 00:51:24 jonathan Exp $	*/
 
 /*-
@@ -43,10 +43,8 @@
 #include <net/if.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <machine/bus.h>
 #include <machine/intr.h>
diff --git a/sys/dev/pci/if_nep.c b/sys/dev/pci/if_nep.c
index 90fcdee9938..9dbc879619e 100644
--- a/sys/dev/pci/if_nep.c
+++ b/sys/dev/pci/if_nep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nep.c,v 1.1 2014/02/15 15:19:46 kettenis Exp $	*/
+/*	$OpenBSD: if_nep.c,v 1.2 2014/12/22 02:28:52 tedu Exp $	*/
 /*
  * Copyright (c) 2014 Mark Kettenis
  *
@@ -25,10 +25,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
@@ -296,10 +294,8 @@ nep_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	switch (cmd) {
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_ac, ifa);
-#endif
 		/* FALLTHROUGH */
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index 038e869d2e1..12af20ab77d 100644
--- a/sys/dev/pci/if_nfe.c
+++ b/sys/dev/pci/if_nfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nfe.c,v 1.107 2014/08/20 23:56:57 dlg Exp $	*/
+/*	$OpenBSD: if_nfe.c,v 1.108 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -40,10 +40,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #if NVLAN > 0
 #include <net/if_types.h>
@@ -533,10 +531,8 @@ nfe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			nfe_init(ifp);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index b027aa4e48c..fe685e59506 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nge.c,v 1.80 2014/08/20 00:59:56 dlg Exp $	*/
+/*	$OpenBSD: if_nge.c,v 1.81 2014/12/22 02:28:52 tedu Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -104,10 +104,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #if NVLAN > 0
 #include <net/if_types.h>
@@ -1796,12 +1794,10 @@ nge_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
 		switch (ifa->ifa_addr->sa_family) {
-#ifdef INET
 		case AF_INET:
 			nge_init(sc);
 			arp_ifinit(&sc->arpcom, ifa);
 			break;
-#endif /* INET */
 		default:
 			nge_init(sc);
 			break;
diff --git a/sys/dev/pci/if_nxe.c b/sys/dev/pci/if_nxe.c
index 3f3e972626e..080b663c99b 100644
--- a/sys/dev/pci/if_nxe.c
+++ b/sys/dev/pci/if_nxe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nxe.c,v 1.66 2014/07/13 23:10:23 deraadt Exp $ */
+/*	$OpenBSD: if_nxe.c,v 1.67 2014/12/22 02:28:52 tedu Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -47,10 +47,8 @@
 #include <net/bpf.h>
 #endif
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #ifdef NXE_DEBUG
 int nxedebug = 0;
@@ -1029,10 +1027,8 @@ nxe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t addr)
 	switch (cmd) {
 	case SIOCSIFADDR:
 		SET(ifp->if_flags, IFF_UP);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_ac, ifa);
-#endif
 		/* FALLTHROUGH */
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_oce.c b/sys/dev/pci/if_oce.c
index 09371a0675e..fd629bc41af 100644
--- a/sys/dev/pci/if_oce.c
+++ b/sys/dev/pci/if_oce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_oce.c,v 1.80 2014/12/13 21:05:33 doug Exp $	*/
+/*	$OpenBSD: if_oce.c,v 1.81 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 2012 Mike Belopuhov
@@ -73,10 +73,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #ifdef INET6
 #include <netinet/ip6.h>
@@ -863,10 +861,8 @@ oce_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			oce_init(sc);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_ac, ifa);
-#endif
 		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
@@ -1338,9 +1334,7 @@ struct mbuf *
 oce_tso(struct oce_softc *sc, struct mbuf **mpp)
 {
 	struct mbuf *m;
-#ifdef INET
 	struct ip *ip;
-#endif
 #ifdef INET6
 	struct ip6_hdr *ip6;
 #endif
@@ -1369,7 +1363,6 @@ oce_tso(struct oce_softc *sc, struct mbuf **mpp)
 	}
 
 	switch (etype) {
-#ifdef INET
 	case ETHERTYPE_IP:
 		ip = (struct ip *)(m->m_data + ehdrlen);
 		if (ip->ip_p != IPPROTO_TCP)
@@ -1378,7 +1371,6 @@ oce_tso(struct oce_softc *sc, struct mbuf **mpp)
 
 		total_len = ehdrlen + (ip->ip_hl << 2) + (th->th_off << 2);
 		break;
-#endif
 #ifdef INET6
 	case ETHERTYPE_IPV6:
 		ip6 = (struct ip6_hdr *)(m->m_data + ehdrlen);
diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c
index 5b0d57b12d9..af8dbe6bed2 100644
--- a/sys/dev/pci/if_pcn.c
+++ b/sys/dev/pci/if_pcn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pcn.c,v 1.32 2014/12/19 22:44:58 guenther Exp $	*/
+/*	$OpenBSD: if_pcn.c,v 1.33 2014/12/22 02:28:52 tedu Exp $	*/
 /*	$NetBSD: if_pcn.c,v 1.26 2005/05/07 09:15:44 is Exp $	*/
 
 /*
@@ -83,10 +83,8 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_media.h>
 
@@ -1057,10 +1055,8 @@ pcn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			pcn_init(ifp);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_re_pci.c b/sys/dev/pci/if_re_pci.c
index 2cee64ba592..3955436d5e0 100644
--- a/sys/dev/pci/if_re_pci.c
+++ b/sys/dev/pci/if_re_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_re_pci.c,v 1.43 2014/10/24 23:30:05 brad Exp $	*/
+/*	$OpenBSD: if_re_pci.c,v 1.44 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org>
@@ -35,10 +35,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_rl_pci.c b/sys/dev/pci/if_rl_pci.c
index a5863af6f3b..67433e07346 100644
--- a/sys/dev/pci/if_rl_pci.c
+++ b/sys/dev/pci/if_rl_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rl_pci.c,v 1.29 2014/11/24 02:03:37 brad Exp $ */
+/*	$OpenBSD: if_rl_pci.c,v 1.30 2014/12/22 02:28:52 tedu Exp $ */
 
 /*
  * Copyright (c) 1997, 1998
@@ -48,10 +48,8 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_media.h>
 
diff --git a/sys/dev/pci/if_rtw_pci.c b/sys/dev/pci/if_rtw_pci.c
index 7d787a1d49e..ac0f81a6705 100644
--- a/sys/dev/pci/if_rtw_pci.c
+++ b/sys/dev/pci/if_rtw_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rtw_pci.c,v 1.18 2014/12/19 22:44:58 guenther Exp $	*/
+/*	$OpenBSD: if_rtw_pci.c,v 1.19 2014/12/22 02:28:52 tedu Exp $	*/
 /*	$NetBSD: if_rtw_pci.c,v 1.1 2004/09/26 02:33:36 dyoung Exp $	*/
 
 /*-
@@ -53,10 +53,8 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_radiotap.h>
 #include <net80211/ieee80211_var.h>
diff --git a/sys/dev/pci/if_se.c b/sys/dev/pci/if_se.c
index 31dd95617e9..e9aedc11e4a 100644
--- a/sys/dev/pci/if_se.c
+++ b/sys/dev/pci/if_se.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_se.c,v 1.9 2013/12/28 03:34:54 deraadt Exp $	*/
+/*	$OpenBSD: if_se.c,v 1.10 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*-
  * Copyright (c) 2009, 2010 Christopher Zimmermann <madroach@zakweb.de>
@@ -1359,9 +1359,7 @@ se_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct se_softc *sc = ifp->if_softc;
 	struct ifreq *ifr = (struct ifreq *) data;
-#ifdef INET
 	struct ifaddr *ifa = (struct ifaddr *)data;
-#endif
 	int s, rc = 0;
 
 	s = splnet();
@@ -1372,10 +1370,8 @@ se_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		if ((ifp->if_flags & IFF_RUNNING) == 0)
 			rc = se_init(ifp);
 		if (rc == 0) {
-#ifdef INET
 			if (ifa->ifa_addr->sa_family == AF_INET)
 				arp_ifinit(&sc->sc_ac, ifa);
-#endif
 		}
 		break;
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_sf_pci.c b/sys/dev/pci/if_sf_pci.c
index af03cbf47ab..55461536e1d 100644
--- a/sys/dev/pci/if_sf_pci.c
+++ b/sys/dev/pci/if_sf_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sf_pci.c,v 1.11 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: if_sf_pci.c,v 1.12 2014/12/22 02:28:52 tedu Exp $	*/
 /*	$NetBSD: if_sf_pci.c,v 1.10 2006/06/17 23:34:27 christos Exp $	*/
 
 /*-
@@ -49,10 +49,8 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_media.h>
 
diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c
index c8d0bea6e24..fcaa1b468a1 100644
--- a/sys/dev/pci/if_sis.c
+++ b/sys/dev/pci/if_sis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sis.c,v 1.120 2014/12/17 03:50:53 brad Exp $ */
+/*	$OpenBSD: if_sis.c,v 1.121 2014/12/22 02:28:52 tedu Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -75,10 +75,8 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_media.h>
 
@@ -1892,10 +1890,8 @@ sis_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			sis_init(sc);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 1523f0019b0..0eaa685df16 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sk.c,v 1.172 2014/08/20 03:29:35 dlg Exp $	*/
+/*	$OpenBSD: if_sk.c,v 1.173 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -103,10 +103,8 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_media.h>
 #include <net/if_vlan_var.h>
@@ -701,10 +699,8 @@ sk_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			sk_init(sc_if);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc_if->arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index c0b47bd05c6..dea76c52e97 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ste.c,v 1.56 2014/12/08 10:58:45 brad Exp $ */
+/*	$OpenBSD: if_ste.c,v 1.57 2014/12/22 02:28:52 tedu Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -50,10 +50,8 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_media.h>
 
@@ -1214,10 +1212,8 @@ ste_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			ste_init(sc);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c
index 653e6391f09..8d19263be1b 100644
--- a/sys/dev/pci/if_stge.c
+++ b/sys/dev/pci/if_stge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_stge.c,v 1.57 2014/12/08 16:21:38 brad Exp $	*/
+/*	$OpenBSD: if_stge.c,v 1.58 2014/12/22 02:28:52 tedu Exp $	*/
 /*	$NetBSD: if_stge.c,v 1.27 2005/05/16 21:35:32 bouyer Exp $	*/
 
 /*-
@@ -53,10 +53,8 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_media.h>
 
@@ -676,10 +674,8 @@ stge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		if (!(ifp->if_flags & IFF_RUNNING))
 			stge_init(ifp);
 
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_tht.c b/sys/dev/pci/if_tht.c
index 75a6824788f..f6342d661e0 100644
--- a/sys/dev/pci/if_tht.c
+++ b/sys/dev/pci/if_tht.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tht.c,v 1.128 2014/07/13 23:10:23 deraadt Exp $ */
+/*	$OpenBSD: if_tht.c,v 1.129 2014/12/22 02:28:52 tedu Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -54,10 +54,8 @@
 #include <net/bpf.h>
 #endif
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #ifdef THT_DEBUG
 #define THT_D_FIFO		(1<<0)
@@ -879,10 +877,8 @@ tht_ioctl(struct ifnet *ifp, u_long cmd, caddr_t addr)
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
 
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_ac, ifa);
-#endif
 		/* FALLTHROUGH */
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_ti_pci.c b/sys/dev/pci/if_ti_pci.c
index 9ff5ea4647f..6c561eed173 100644
--- a/sys/dev/pci/if_ti_pci.c
+++ b/sys/dev/pci/if_ti_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ti_pci.c,v 1.3 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: if_ti_pci.c,v 1.4 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -80,10 +80,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 2c85d4718ad..bd8dcb61b0d 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tl.c,v 1.60 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: if_tl.c,v 1.61 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -194,10 +194,8 @@
 
 #include <net/if.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_dl.h>
 #include <net/if_media.h>
@@ -1673,10 +1671,8 @@ tl_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			tl_init(sc);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index 2799380115a..73b95bd44a7 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_txp.c,v 1.112 2014/12/06 23:20:17 krw Exp $	*/
+/*	$OpenBSD: if_txp.c,v 1.113 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 2001
@@ -48,10 +48,8 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_media.h>
 
@@ -1182,12 +1180,10 @@ txp_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
 		switch (ifa->ifa_addr->sa_family) {
-#ifdef INET
 		case AF_INET:
 			txp_init(sc);
 			arp_ifinit(&sc->sc_arpcom, ifa);
 			break;
-#endif /* INET */
 		default:
 			txp_init(sc);
 			break;
diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c
index 77b2eb749f1..1d15c3a03b5 100644
--- a/sys/dev/pci/if_vge.c
+++ b/sys/dev/pci/if_vge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vge.c,v 1.58 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: if_vge.c,v 1.59 2014/12/22 02:28:52 tedu Exp $	*/
 /*	$FreeBSD: if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $	*/
 /*
  * Copyright (c) 2004
@@ -99,10 +99,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #if NVLAN > 0
 #include <net/if_types.h>
@@ -1777,10 +1775,8 @@ vge_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			vge_init(ifp);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_vic.c b/sys/dev/pci/if_vic.c
index cdea3b6bbee..93601170dca 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.82 2014/12/01 01:59:45 brad Exp $	*/
+/*	$OpenBSD: if_vic.c,v 1.83 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 2006 Reyk Floeter <reyk@openbsd.org>
@@ -45,10 +45,8 @@
 #include <net/bpf.h>
 #endif
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
@@ -1213,10 +1211,8 @@ vic_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	switch (cmd) {
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_ac, ifa);
-#endif
 		/* FALLTHROUGH */
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
diff --git a/sys/dev/pci/if_vio.c b/sys/dev/pci/if_vio.c
index 742bf13d5f2..12013f37342 100644
--- a/sys/dev/pci/if_vio.c
+++ b/sys/dev/pci/if_vio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vio.c,v 1.21 2014/12/13 21:05:33 doug Exp $	*/
+/*	$OpenBSD: if_vio.c,v 1.22 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 2012 Stefan Fritsch, Alexander Fiveg.
@@ -48,10 +48,8 @@
 #include <net/if_media.h>
 #include <net/if_types.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
@@ -835,10 +833,8 @@ vio_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			vio_init(ifp);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_ac, ifa);
-#endif
 		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
diff --git a/sys/dev/pci/if_vmx.c b/sys/dev/pci/if_vmx.c
index e1d887cabae..f656fcd90cf 100644
--- a/sys/dev/pci/if_vmx.c
+++ b/sys/dev/pci/if_vmx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vmx.c,v 1.21 2014/12/19 02:32:57 brad Exp $	*/
+/*	$OpenBSD: if_vmx.c,v 1.22 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 2013 Tsubai Masanari
@@ -988,10 +988,8 @@ vmxnet3_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if ((ifp->if_flags & IFF_RUNNING) == 0)
 			error = vmxnet3_init(sc);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_arpcom, ifa);
-#endif
 		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index 63754ef325d..81189c83fe1 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vr.c,v 1.136 2014/11/27 03:49:07 brad Exp $	*/
+/*	$OpenBSD: if_vr.c,v 1.137 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -74,10 +74,8 @@
 
 #include <net/if.h>
 #include <sys/device.h>
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif	/* INET */
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
@@ -1555,10 +1553,8 @@ vr_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			vr_init(sc);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->arpcom, ifa);
-#endif
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c
index 7c5b9943738..eb34e094ff2 100644
--- a/sys/dev/pci/if_vte.c
+++ b/sys/dev/pci/if_vte.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vte.c,v 1.10 2014/11/18 02:37:30 tedu Exp $	*/
+/*	$OpenBSD: if_vte.c,v 1.11 2014/12/22 02:28:52 tedu Exp $	*/
 /*-
  * Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -49,10 +49,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
@@ -738,10 +736,8 @@ vte_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			vte_init(ifp);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_arpcom, ifa);
-#endif
 		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c
index 5c45bca1c21..88fa5c1282c 100644
--- a/sys/dev/pci/if_wb.c
+++ b/sys/dev/pci/if_wb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wb.c,v 1.57 2014/12/03 09:10:17 brad Exp $	*/
+/*	$OpenBSD: if_wb.c,v 1.58 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -102,10 +102,8 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_media.h>
 
@@ -1538,12 +1536,10 @@ int wb_ioctl(ifp, command, data)
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
 		switch (ifa->ifa_addr->sa_family) {
-#ifdef INET
 		case AF_INET:
 			wb_init(sc);
 			arp_ifinit(&sc->arpcom, ifa);
 			break;
-#endif /* INET */
 		default:
 			wb_init(sc);
 		}
diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c
index a14a13187d4..6b1d8202228 100644
--- a/sys/dev/pci/if_wi_pci.c
+++ b/sys/dev/pci/if_wi_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_pci.c,v 1.50 2013/12/06 21:03:04 deraadt Exp $	*/
+/*	$OpenBSD: if_wi_pci.c,v 1.51 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 2001-2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -51,10 +51,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_ioctl.h>
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index 993338a74ca..4fba795d4a9 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wpi.c,v 1.121 2014/12/19 22:44:58 guenther Exp $	*/
+/*	$OpenBSD: if_wpi.c,v 1.122 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*-
  * Copyright (c) 2006-2008
@@ -2003,10 +2003,8 @@ wpi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	case SIOCSIFADDR:
 		ifa = (struct ifaddr *)data;
 		ifp->if_flags |= IFF_UP;
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&ic->ic_ac, ifa);
-#endif
 		/* FALLTHROUGH */
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index 796ebd22709..8fab753b527 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xge.c,v 1.58 2014/12/19 22:44:58 guenther Exp $	*/
+/*	$OpenBSD: if_xge.c,v 1.59 2014/12/22 02:28:52 tedu Exp $	*/
 /*	$NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $	*/
 
 /*
@@ -56,10 +56,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #if NVLAN > 0
 #include <net/if_types.h>
@@ -960,10 +958,8 @@ xge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			xge_init(ifp);
-#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET)
 			arp_ifinit(&sc->sc_arpcom, ifa);
-#endif /* INET */
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pci/if_xl_pci.c b/sys/dev/pci/if_xl_pci.c
index c59af2588bc..16a3068aae8 100644
--- a/sys/dev/pci/if_xl_pci.c
+++ b/sys/dev/pci/if_xl_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xl_pci.c,v 1.42 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: if_xl_pci.c,v 1.43 2014/12/22 02:28:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -52,10 +52,8 @@
 #include <net/if_types.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/ixgb_ee.c b/sys/dev/pci/ixgb_ee.c
index f9659b41480..6641484d0ab 100644
--- a/sys/dev/pci/ixgb_ee.c
+++ b/sys/dev/pci/ixgb_ee.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/* $OpenBSD: ixgb_ee.c,v 1.4 2014/07/22 13:12:11 mpi Exp $ */
+/* $OpenBSD: ixgb_ee.c,v 1.5 2014/12/22 02:28:52 tedu Exp $ */
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,10 +46,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/dev/pci/ixgb_hw.c b/sys/dev/pci/ixgb_hw.c
index 7961645c5e8..96848563a03 100644
--- a/sys/dev/pci/ixgb_hw.c
+++ b/sys/dev/pci/ixgb_hw.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/* $OpenBSD: ixgb_hw.c,v 1.5 2014/07/22 13:12:11 mpi Exp $ */
+/* $OpenBSD: ixgb_hw.c,v 1.6 2014/12/22 02:28:52 tedu Exp $ */
 
 /* ixgb_hw.c
  * Shared functions for accessing and configuring the adapter
@@ -50,10 +50,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <uvm/uvm_extern.h>