diff options
Diffstat (limited to 'sys')
148 files changed, 148 insertions, 558 deletions
diff --git a/sys/dev/cardbus/if_acx_cardbus.c b/sys/dev/cardbus/if_acx_cardbus.c index cf2268b45fd..3edd69f89c5 100644 --- a/sys/dev/cardbus/if_acx_cardbus.c +++ b/sys/dev/cardbus/if_acx_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_acx_cardbus.c,v 1.19 2010/09/06 19:20:21 deraadt Exp $ */ +/* $OpenBSD: if_acx_cardbus.c,v 1.20 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -41,10 +41,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_amrr.h> diff --git a/sys/dev/cardbus/if_ath_cardbus.c b/sys/dev/cardbus/if_ath_cardbus.c index 68409e13c4a..1e547a160b1 100644 --- a/sys/dev/cardbus/if_ath_cardbus.c +++ b/sys/dev/cardbus/if_ath_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ath_cardbus.c,v 1.17 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: if_ath_cardbus.c,v 1.18 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: if_ath_cardbus.c,v 1.4 2004/08/02 19:14:28 mycroft Exp $ */ /* @@ -54,10 +54,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_rssadapt.h> diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c index 24f51cf0408..5a6414894b8 100644 --- a/sys/dev/cardbus/if_atw_cardbus.c +++ b/sys/dev/cardbus/if_atw_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atw_cardbus.c,v 1.21 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: if_atw_cardbus.c,v 1.22 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: if_atw_cardbus.c,v 1.9 2004/07/23 07:07:55 dyoung Exp $ */ /*- @@ -53,10 +53,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_radiotap.h> #include <net80211/ieee80211_var.h> diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c index e07ea20846a..3a215cbebc6 100644 --- a/sys/dev/cardbus/if_rtw_cardbus.c +++ b/sys/dev/cardbus/if_rtw_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rtw_cardbus.c,v 1.23 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: if_rtw_cardbus.c,v 1.24 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */ /*- @@ -83,10 +83,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/dec/if_le_dec.c b/sys/dev/dec/if_le_dec.c index 4afa0c528af..505f94dbcaa 100644 --- a/sys/dev/dec/if_le_dec.c +++ b/sys/dev/dec/if_le_dec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_dec.c,v 1.5 2013/09/24 20:10:54 miod Exp $ */ +/* $OpenBSD: if_le_dec.c,v 1.6 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: if_le_dec.c,v 1.12 2001/11/13 12:49:45 lukem Exp $ */ /*- @@ -47,10 +47,8 @@ #include <net/if.h> #include <net/if_media.h> -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <dev/ic/lancereg.h> #include <dev/ic/lancevar.h> diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c index a21341dba78..1be5f3da6e3 100644 --- a/sys/dev/ic/acx.c +++ b/sys/dev/ic/acx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acx.c,v 1.108 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: acx.c,v 1.109 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -113,10 +113,8 @@ #include <net/bpf.h> #endif -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_amrr.h> @@ -853,10 +851,8 @@ acx_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/ic/acx100.c b/sys/dev/ic/acx100.c index f8d9d49b21f..7dd25fe1524 100644 --- a/sys/dev/ic/acx100.c +++ b/sys/dev/ic/acx100.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acx100.c,v 1.24 2014/09/25 04:19:45 jsg Exp $ */ +/* $OpenBSD: acx100.c,v 1.25 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -65,10 +65,8 @@ #include <net/if_arp.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_amrr.h> diff --git a/sys/dev/ic/acx111.c b/sys/dev/ic/acx111.c index 6274bc74760..efd7a4c1b7e 100644 --- a/sys/dev/ic/acx111.c +++ b/sys/dev/ic/acx111.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acx111.c,v 1.21 2014/11/18 23:55:01 krw Exp $ */ +/* $OpenBSD: acx111.c,v 1.22 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -64,10 +64,8 @@ #include <net/if_arp.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_amrr.h> diff --git a/sys/dev/ic/aic6915.c b/sys/dev/ic/aic6915.c index 6f183b5b087..6d1e0c3775c 100644 --- a/sys/dev/ic/aic6915.c +++ b/sys/dev/ic/aic6915.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic6915.c,v 1.13 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: aic6915.c,v 1.14 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: aic6915.c,v 1.15 2005/12/24 20:27:29 perry Exp $ */ /*- @@ -52,10 +52,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> @@ -520,10 +518,8 @@ sf_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) sf_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/ic/am7990.c b/sys/dev/ic/am7990.c index 3f5af7e825f..542e328d915 100644 --- a/sys/dev/ic/am7990.c +++ b/sys/dev/ic/am7990.c @@ -1,4 +1,4 @@ -/* $OpenBSD: am7990.c,v 1.48 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: am7990.c,v 1.49 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: am7990.c,v 1.74 2012/02/02 19:43:02 tls Exp $ */ /*- @@ -80,10 +80,8 @@ #include <net/if.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/ic/am79900.c b/sys/dev/ic/am79900.c index 10bd6681b94..a77f2516aec 100644 --- a/sys/dev/ic/am79900.c +++ b/sys/dev/ic/am79900.c @@ -1,4 +1,4 @@ -/* $OpenBSD: am79900.c,v 1.2 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: am79900.c,v 1.3 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: am79900.c,v 1.23 2012/02/02 19:43:02 tls Exp $ */ /*- @@ -118,10 +118,8 @@ #include <net/if.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/ic/an.c b/sys/dev/ic/an.c index 685bf868852..c37be3ee3ce 100644 --- a/sys/dev/ic/an.c +++ b/sys/dev/ic/an.c @@ -1,4 +1,4 @@ -/* $OpenBSD: an.c,v 1.62 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: an.c,v 1.63 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: an.c,v 1.34 2005/06/20 02:49:18 atatat Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -99,10 +99,8 @@ #include <net/if_media.h> #include <net/if_types.h> -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <net80211/ieee80211_radiotap.h> #include <net80211/ieee80211_var.h> @@ -889,12 +887,10 @@ an_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: error = an_init(ifp); arp_ifinit(&sc->sc_ic.ic_ac, ifa); break; -#endif default: error = an_init(ifp); break; diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c index 549560644b1..23aa8751001 100644 --- a/sys/dev/ic/ath.c +++ b/sys/dev/ic/ath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ath.c,v 1.102 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: ath.c,v 1.103 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */ /*- @@ -66,10 +66,8 @@ #if NBPFILTER > 0 #include <net/bpf.h> #endif -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_rssadapt.h> @@ -987,11 +985,9 @@ ath_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(&ic->ic_ac, ifa); } -#endif /* INET */ /* FALLTHROUGH */ case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { diff --git a/sys/dev/ic/athn.c b/sys/dev/ic/athn.c index cf14573557b..f72d0c48809 100644 --- a/sys/dev/ic/athn.c +++ b/sys/dev/ic/athn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: athn.c,v 1.84 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: athn.c,v 1.85 2014/12/22 02:28:51 tedu Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -2668,10 +2668,8 @@ athn_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/ic/atw.c b/sys/dev/ic/atw.c index 8961e957b44..e7ee8c24717 100644 --- a/sys/dev/ic/atw.c +++ b/sys/dev/ic/atw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atw.c,v 1.84 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: atw.c,v 1.85 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $ */ /*- @@ -56,10 +56,8 @@ #include <net/bpf.h> #endif -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_radiotap.h> @@ -4022,11 +4020,9 @@ atw_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(&ic->ic_ac, ifa); } -#endif /* INET */ /* FALLTHROUGH */ case SIOCSIFFLAGS: diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c index 7ef625f0dc1..2423858fe48 100644 --- a/sys/dev/ic/bwi.c +++ b/sys/dev/ic/bwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bwi.c,v 1.112 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: bwi.c,v 1.113 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. @@ -7131,10 +7131,8 @@ bwi_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/ic/dc.c b/sys/dev/ic/dc.c index 01438d46450..ca12cb6d1df 100644 --- a/sys/dev/ic/dc.c +++ b/sys/dev/ic/dc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dc.c,v 1.135 2014/11/18 22:53:56 brad Exp $ */ +/* $OpenBSD: dc.c,v 1.136 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -2934,10 +2934,8 @@ dc_ioctl(struct ifnet *ifp, u_long command, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) dc_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/ic/dp8390.c b/sys/dev/ic/dp8390.c index 28ebd764ce1..c620f2d1f47 100644 --- a/sys/dev/ic/dp8390.c +++ b/sys/dev/ic/dp8390.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dp8390.c,v 1.47 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: dp8390.c,v 1.48 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: dp8390.c,v 1.13 1998/07/05 06:49:11 jonathan Exp $ */ /* @@ -817,10 +817,8 @@ dp8390_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) dp8390_init(sc); -#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/ic/elink3.c b/sys/dev/ic/elink3.c index bf7c7ec0293..71b72788143 100644 --- a/sys/dev/ic/elink3.c +++ b/sys/dev/ic/elink3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elink3.c,v 1.80 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: elink3.c,v 1.81 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $ */ /* @@ -1442,12 +1442,10 @@ epioctl(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: epinit(sc); arp_ifinit(&sc->sc_arpcom, ifa); break; -#endif default: epinit(sc); break; diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c index 7129e9aa862..d636a4d4d7a 100644 --- a/sys/dev/ic/fxp.c +++ b/sys/dev/ic/fxp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fxp.c,v 1.117 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: fxp.c,v 1.118 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $ */ /* @@ -53,10 +53,8 @@ #include <net/if_media.h> #include <net/if_types.h> -#ifdef INET #include <netinet/in.h> #include <netinet/ip.h> -#endif #if NBPFILTER > 0 #include <net/bpf.h> @@ -1649,10 +1647,8 @@ fxp_ioctl(struct ifnet *ifp, u_long command, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) fxp_init(sc); -#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/ic/gem.c b/sys/dev/ic/gem.c index 50aa4777f31..e97c235b792 100644 --- a/sys/dev/ic/gem.c +++ b/sys/dev/ic/gem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gem.c,v 1.107 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: gem.c,v 1.108 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: gem.c,v 1.1 2001/09/16 00:11:43 eeh Exp $ */ /* @@ -1508,10 +1508,8 @@ gem_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if ((ifp->if_flags & IFF_RUNNING) == 0) gem_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/ic/hme.c b/sys/dev/ic/hme.c index 1a316127171..9f7e5f57463 100644 --- a/sys/dev/ic/hme.c +++ b/sys/dev/ic/hme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hme.c,v 1.69 2014/11/27 14:53:42 brad Exp $ */ +/* $OpenBSD: hme.c,v 1.70 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: hme.c,v 1.21 2001/07/07 15:59:37 thorpej Exp $ */ /*- @@ -54,10 +54,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> @@ -1170,10 +1168,8 @@ hme_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) hme_init(sc); -#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/ic/i82596.c b/sys/dev/ic/i82596.c index b4ad779a47c..9c1ac9b01e8 100644 --- a/sys/dev/ic/i82596.c +++ b/sys/dev/ic/i82596.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82596.c,v 1.39 2014/07/22 13:12:12 mpi Exp $ */ +/* $OpenBSD: i82596.c,v 1.40 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: i82586.c,v 1.18 1998/08/15 04:42:42 mycroft Exp $ */ /*- @@ -154,10 +154,8 @@ Mode of operation: #include <net/bpf.h> #endif -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <machine/bus.h> @@ -1877,12 +1875,10 @@ i82596_ioctl(ifp, cmd, data) ifp->if_flags |= IFF_UP; switch(ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: i82596_init(sc); arp_ifinit(&sc->sc_arpcom, ifa); break; -#endif default: i82596_init(sc); break; diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c index aa33896893b..2ba3c170ae8 100644 --- a/sys/dev/ic/if_wi.c +++ b/sys/dev/ic/if_wi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi.c,v 1.158 2014/11/18 02:37:30 tedu Exp $ */ +/* $OpenBSD: if_wi.c,v 1.159 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -78,10 +78,8 @@ #include <net/if_media.h> #include <net/if_types.h> -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_ioctl.h> @@ -1572,12 +1570,10 @@ wi_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: wi_init(sc); arp_ifinit(&sc->sc_ic.ic_ac, ifa); break; -#endif /* INET */ default: wi_init(sc); break; diff --git a/sys/dev/ic/lance.c b/sys/dev/ic/lance.c index c959a8e2055..317e085b5f8 100644 --- a/sys/dev/ic/lance.c +++ b/sys/dev/ic/lance.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lance.c,v 1.4 2014/07/22 13:12:12 mpi Exp $ */ +/* $OpenBSD: lance.c,v 1.5 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: lance.c,v 1.46 2012/02/02 19:43:03 tls Exp $ */ /*- @@ -80,10 +80,8 @@ #include <net/if.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> @@ -530,10 +528,8 @@ lance_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) lance_init(sc); -#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/ic/lemac.c b/sys/dev/ic/lemac.c index 8a5d3338249..813f69f0c2c 100644 --- a/sys/dev/ic/lemac.c +++ b/sys/dev/ic/lemac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lemac.c,v 1.17 2014/07/22 13:12:12 mpi Exp $ */ +/* $OpenBSD: lemac.c,v 1.18 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: lemac.c,v 1.20 2001/06/13 10:46:02 wiz Exp $ */ /*- @@ -50,10 +50,8 @@ #include <net/route.h> #include <net/if_media.h> -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <machine/bus.h> @@ -798,11 +796,9 @@ lemac_ifioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; lemac_init(sc); switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: arp_ifinit(&sc->sc_arpcom, ifa); break; -#endif /* INET */ default: break; diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c index 8278bcf0aef..f22c8d5d34b 100644 --- a/sys/dev/ic/malo.c +++ b/sys/dev/ic/malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malo.c,v 1.103 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: malo.c,v 1.104 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -946,10 +946,8 @@ malo_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/ic/mtd8xx.c b/sys/dev/ic/mtd8xx.c index c566b66add4..473f9b775ca 100644 --- a/sys/dev/ic/mtd8xx.c +++ b/sys/dev/ic/mtd8xx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mtd8xx.c,v 1.23 2014/12/08 10:58:45 brad Exp $ */ +/* $OpenBSD: mtd8xx.c,v 1.24 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 2003 Oleg Safiullin <form@pdp11.org.ru> @@ -44,10 +44,8 @@ #include <net/bpf.h> #endif -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <machine/bus.h> @@ -585,11 +583,9 @@ mtd_ioctl(struct ifnet *ifp, u_long command, caddr_t data) ifp->if_flags |= IFF_UP; mtd_init(ifp); switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: arp_ifinit(&sc->sc_arpcom, ifa); break; -#endif /* INET */ } break; diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c index 934d9355fa9..d0686226d62 100644 --- a/sys/dev/ic/pgt.c +++ b/sys/dev/ic/pgt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pgt.c,v 1.76 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: pgt.c,v 1.77 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -73,10 +73,8 @@ #include <net/bpf.h> #endif -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_radiotap.h> @@ -2353,10 +2351,8 @@ pgt_ioctl(struct ifnet *ifp, u_long cmd, caddr_t req) case SIOCSIFADDR: ifa = (struct ifaddr *)req; ifp->if_flags |= IFF_UP; -#ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) arp_ifinit(&sc->sc_ic.ic_ac, ifa); -#endif /* FALLTHROUGH */ case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c index 439d8ec17d4..cfe644254bc 100644 --- a/sys/dev/ic/re.c +++ b/sys/dev/ic/re.c @@ -1,4 +1,4 @@ -/* $OpenBSD: re.c,v 1.164 2014/12/19 04:53:58 brad Exp $ */ +/* $OpenBSD: re.c,v 1.165 2014/12/22 02:28:51 tedu Exp $ */ /* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -127,10 +127,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> @@ -2029,10 +2027,8 @@ re_ioctl(struct ifnet *ifp, u_long command, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) re_init(ifp); -#ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) arp_ifinit(&sc->sc_arpcom, ifa); -#endif /* INET */ break; case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c index 5a40c6158d3..431a9db86d2 100644 --- a/sys/dev/ic/rt2560.c +++ b/sys/dev/ic/rt2560.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2560.c,v 1.68 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: rt2560.c,v 1.69 2014/12/22 02:28:51 tedu Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -2018,10 +2018,8 @@ rt2560_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/ic/rt2661.c b/sys/dev/ic/rt2661.c index 61f3a4b2db6..1e57f540bad 100644 --- a/sys/dev/ic/rt2661.c +++ b/sys/dev/ic/rt2661.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2661.c,v 1.77 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: rt2661.c,v 1.78 2014/12/22 02:28:51 tedu Exp $ */ /*- * Copyright (c) 2006 @@ -2023,10 +2023,8 @@ rt2661_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/ic/rt2860.c b/sys/dev/ic/rt2860.c index 75859db260c..e1a1724d252 100644 --- a/sys/dev/ic/rt2860.c +++ b/sys/dev/ic/rt2860.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860.c,v 1.77 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: rt2860.c,v 1.78 2014/12/22 02:28:51 tedu Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -1827,10 +1827,8 @@ rt2860_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/ic/rtl80x9.c b/sys/dev/ic/rtl80x9.c index 6cc69106807..807676c6c12 100644 --- a/sys/dev/ic/rtl80x9.c +++ b/sys/dev/ic/rtl80x9.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl80x9.c,v 1.8 2008/06/26 05:42:16 ray Exp $ */ +/* $OpenBSD: rtl80x9.c,v 1.9 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: rtl80x9.c,v 1.1 1998/10/31 00:44:33 thorpej 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> diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c index 7c138dc5dc4..2f0bf2a93e2 100644 --- a/sys/dev/ic/rtl81x9.c +++ b/sys/dev/ic/rtl81x9.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl81x9.c,v 1.85 2014/12/08 10:58:45 brad Exp $ */ +/* $OpenBSD: rtl81x9.c,v 1.86 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 1997, 1998 @@ -99,10 +99,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> @@ -1026,10 +1024,8 @@ rl_ioctl(struct ifnet *ifp, u_long command, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) rl_init(sc); -#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/ic/rtw.c b/sys/dev/ic/rtw.c index 1897e5a5e12..1e560717ec8 100644 --- a/sys/dev/ic/rtw.c +++ b/sys/dev/ic/rtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtw.c,v 1.88 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: rtw.c,v 1.89 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */ /*- @@ -58,10 +58,8 @@ #include <net/bpf.h> #endif -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_radiotap.h> @@ -2616,11 +2614,9 @@ rtw_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(&ic->ic_ac, ifa); } -#endif /* INET */ /* FALLTHROUGH */ case SIOCSIFFLAGS: diff --git a/sys/dev/ic/smc83c170.c b/sys/dev/ic/smc83c170.c index f41b13219d5..32ce7a904a9 100644 --- a/sys/dev/ic/smc83c170.c +++ b/sys/dev/ic/smc83c170.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smc83c170.c,v 1.17 2014/07/22 13:12:12 mpi Exp $ */ +/* $OpenBSD: smc83c170.c,v 1.18 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: smc83c170.c,v 1.59 2005/02/27 00:27:02 perry Exp $ */ /*- @@ -52,10 +52,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> @@ -536,12 +534,10 @@ epic_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: epic_init(ifp); arp_ifinit(&sc->sc_arpcom, ifa); break; -#endif default: epic_init(ifp); break; diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c index c0eab02d4d3..51a43d077f4 100644 --- a/sys/dev/ic/smc91cxx.c +++ b/sys/dev/ic/smc91cxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smc91cxx.c,v 1.36 2014/09/23 02:53:59 dlg Exp $ */ +/* $OpenBSD: smc91cxx.c,v 1.37 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: smc91cxx.c,v 1.11 1998/08/08 23:51:41 mycroft Exp $ */ /*- @@ -92,10 +92,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> @@ -1042,12 +1040,10 @@ smc91cxx_ioctl(ifp, cmd, data) break; ifp->if_flags |= IFF_UP; switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: smc91cxx_init(sc); arp_ifinit(&sc->sc_arpcom, ifa); break; -#endif default: smc91cxx_init(sc); break; diff --git a/sys/dev/ic/ti.c b/sys/dev/ic/ti.c index b1a445f554e..f98323449f1 100644 --- a/sys/dev/ic/ti.c +++ b/sys/dev/ic/ti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ti.c,v 1.11 2014/12/06 23:20:17 krw Exp $ */ +/* $OpenBSD: ti.c,v 1.12 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -88,10 +88,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> @@ -2245,10 +2243,8 @@ ti_ioctl(struct ifnet *ifp, u_long command, caddr_t data) ifp->if_flags |= IFF_UP; if ((ifp->if_flags & IFF_RUNNING) == 0) ti_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/ic/xl.c b/sys/dev/ic/xl.c index e45764b7a2d..29af4c705b2 100644 --- a/sys/dev/ic/xl.c +++ b/sys/dev/ic/xl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xl.c,v 1.120 2014/12/19 07:23:57 deraadt Exp $ */ +/* $OpenBSD: xl.c,v 1.121 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -118,10 +118,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> @@ -2215,10 +2213,8 @@ xl_ioctl(struct ifnet *ifp, u_long command, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) xl_init(sc); -#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/isa/if_ef_isapnp.c b/sys/dev/isa/if_ef_isapnp.c index b05ac5e07aa..b4f8851d055 100644 --- a/sys/dev/isa/if_ef_isapnp.c +++ b/sys/dev/isa/if_ef_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ef_isapnp.c,v 1.26 2014/08/11 12:45:45 mpi Exp $ */ +/* $OpenBSD: if_ef_isapnp.c,v 1.27 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -345,12 +345,10 @@ efioctl(ifp, cmd, data) case SIOCSIFADDR: ifp->if_flags |= IFF_UP; switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: efinit(sc); arp_ifinit(&sc->sc_arpcom, ifa); break; -#endif default: efinit(sc); break; diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c index e5f08fbc0d4..4ebf30ca756 100644 --- a/sys/dev/isa/if_eg.c +++ b/sys/dev/isa/if_eg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_eg.c,v 1.35 2014/08/11 12:45:45 mpi Exp $ */ +/* $OpenBSD: if_eg.c,v 1.36 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $ */ /* @@ -759,12 +759,10 @@ egioctl(register 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: eginit(sc); arp_ifinit(&sc->sc_arpcom, ifa); break; -#endif default: eginit(sc); break; diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c index ad82170a1af..66315aa02b6 100644 --- a/sys/dev/isa/if_el.c +++ b/sys/dev/isa/if_el.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_el.c,v 1.23 2014/08/11 12:45:45 mpi Exp $ */ +/* $OpenBSD: if_el.c,v 1.24 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: if_el.c,v 1.39 1996/05/12 23:52:32 mycroft Exp $ */ /* @@ -595,12 +595,10 @@ elioctl(ifp, cmd, data) ifp->if_flags |= IFF_UP; switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: elinit(sc); arp_ifinit(&sc->sc_arpcom, ifa); break; -#endif default: elinit(sc); break; diff --git a/sys/dev/isa/if_ex.c b/sys/dev/isa/if_ex.c index 49eb0775984..0c8f883616e 100644 --- a/sys/dev/isa/if_ex.c +++ b/sys/dev/isa/if_ex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ex.c,v 1.36 2010/07/02 02:29:45 tedu Exp $ */ +/* $OpenBSD: if_ex.c,v 1.37 2014/12/22 02:28:51 tedu Exp $ */ /* * Copyright (c) 1997, Donald A. Schmidt * Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es) @@ -48,10 +48,8 @@ #include <net/if.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> @@ -751,10 +749,8 @@ ex_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) ex_init(sc); -#ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) arp_ifinit(&sc->arpcom, ifa); -#endif break; case SIOCSIFFLAGS: DODEBUG(Start_End, printf("SIOCSIFFLAGS");); diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c index e1391454c6c..d15ead7ca13 100644 --- a/sys/dev/isa/if_ie.c +++ b/sys/dev/isa/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.39 2014/08/11 12:45:45 mpi Exp $ */ +/* $OpenBSD: if_ie.c,v 1.40 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $ */ /*- @@ -2125,12 +2125,10 @@ ieioctl(ifp, cmd, data) ifp->if_flags |= IFF_UP; switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: ieinit(sc); arp_ifinit(&sc->sc_arpcom, ifa); break; -#endif default: ieinit(sc); break; diff --git a/sys/dev/isa/if_le.c b/sys/dev/isa/if_le.c index ef4ce843a66..4c6d9929358 100644 --- a/sys/dev/isa/if_le.c +++ b/sys/dev/isa/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.19 2013/09/24 20:11:00 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.20 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: if_le_isa.c,v 1.2 1996/05/12 23:52:56 mycroft Exp $ */ /*- @@ -49,10 +49,8 @@ #include <net/if.h> #include <net/if_media.h> -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <machine/cpu.h> #include <machine/intr.h> diff --git a/sys/dev/isa/if_le_isa.c b/sys/dev/isa/if_le_isa.c index 146adcabb90..00d852a7959 100644 --- a/sys/dev/isa/if_le_isa.c +++ b/sys/dev/isa/if_le_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_isa.c,v 1.21 2013/09/24 20:11:01 miod Exp $ */ +/* $OpenBSD: if_le_isa.c,v 1.22 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: if_le_isa.c,v 1.2 1996/05/12 23:52:56 mycroft Exp $ */ /*- @@ -49,10 +49,8 @@ #include <net/if.h> #include <net/if_media.h> -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <machine/cpu.h> #include <machine/intr.h> diff --git a/sys/dev/isa/if_le_isapnp.c b/sys/dev/isa/if_le_isapnp.c index fae3d9b158a..cd596ba4fb0 100644 --- a/sys/dev/isa/if_le_isapnp.c +++ b/sys/dev/isa/if_le_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_isapnp.c,v 1.13 2013/09/24 20:11:01 miod Exp $ */ +/* $OpenBSD: if_le_isapnp.c,v 1.14 2014/12/22 02:28:51 tedu Exp $ */ /* $NetBSD: if_le_isa.c,v 1.2 1996/05/12 23:52:56 mycroft Exp $ */ /*- @@ -49,10 +49,8 @@ #include <net/if.h> #include <net/if_media.h> -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <machine/cpu.h> #include <machine/intr.h> 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> diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c index d4b987966ac..f1d749318d9 100644 --- a/sys/dev/pcmcia/if_cnw.c +++ b/sys/dev/pcmcia/if_cnw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cnw.c,v 1.25 2014/08/11 12:45:45 mpi Exp $ */ +/* $OpenBSD: if_cnw.c,v 1.26 2014/12/22 02:28:52 tedu Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -781,11 +781,9 @@ cnw_ioctl(ifp, cmd, data) break; ifp->if_flags |= IFF_UP; switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: arp_ifinit(&sc->sc_arpcom, ifa); break; -#endif } break; diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c index b41c8255765..dd3b7ea58f5 100644 --- a/sys/dev/pcmcia/if_malo.c +++ b/sys/dev/pcmcia/if_malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo.c,v 1.80 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: if_malo.c,v 1.81 2014/12/22 02:28:52 tedu Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -392,10 +392,8 @@ cmalo_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/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index c0d7bae59c1..8ee4527389c 100644 --- a/sys/dev/pcmcia/if_wi_pcmcia.c +++ b/sys/dev/pcmcia/if_wi_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pcmcia.c,v 1.72 2013/12/06 21:03:04 deraadt Exp $ */ +/* $OpenBSD: if_wi_pcmcia.c,v 1.73 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */ /* @@ -54,10 +54,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/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c index ee33dd61c2d..f8c5b0b9c86 100644 --- a/sys/dev/pcmcia/if_xe.c +++ b/sys/dev/pcmcia/if_xe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xe.c,v 1.45 2014/08/11 12:45:45 mpi Exp $ */ +/* $OpenBSD: if_xe.c,v 1.46 2014/12/22 02:28:52 tedu Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist, Brandon Creighton, Job de Haas @@ -1177,10 +1177,8 @@ xe_ioctl(ifp, command, data) case SIOCSIFADDR: ifp->if_flags |= IFF_UP; xe_init(sc); -#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/sbus/be.c b/sys/dev/sbus/be.c index b33b3add5f8..7e1de9faeeb 100644 --- a/sys/dev/sbus/be.c +++ b/sys/dev/sbus/be.c @@ -1,4 +1,4 @@ -/* $OpenBSD: be.c,v 1.27 2014/08/11 12:45:45 mpi Exp $ */ +/* $OpenBSD: be.c,v 1.28 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: be.c,v 1.26 2001/03/20 15:39:20 pk Exp $ */ /*- @@ -932,12 +932,10 @@ beioctl(struct ifnet *ifp, u_long cmd, caddr_t data) case SIOCSIFADDR: ifp->if_flags |= IFF_UP; switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: beinit(sc); arp_ifinit(&sc->sc_arpcom, ifa); break; -#endif /* INET */ default: beinit(sc); break; diff --git a/sys/dev/sbus/if_le.c b/sys/dev/sbus/if_le.c index 7910b8fd149..5053db7f0f3 100644 --- a/sys/dev/sbus/if_le.c +++ b/sys/dev/sbus/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.15 2013/09/24 20:11:02 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.16 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: if_le.c,v 1.17 2001/05/30 11:46:35 mrg Exp $ */ /*- @@ -44,10 +44,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/sbus/if_le_lebuffer.c b/sys/dev/sbus/if_le_lebuffer.c index 5662bd9017f..b899138024b 100644 --- a/sys/dev/sbus/if_le_lebuffer.c +++ b/sys/dev/sbus/if_le_lebuffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_lebuffer.c,v 1.11 2013/09/24 20:11:03 miod Exp $ */ +/* $OpenBSD: if_le_lebuffer.c,v 1.12 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: if_le_lebuffer.c,v 1.10 2002/03/11 16:00:56 pk Exp $ */ /*- @@ -44,10 +44,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/sbus/if_le_ledma.c b/sys/dev/sbus/if_le_ledma.c index 8d0cc142575..7c0c640fcac 100644 --- a/sys/dev/sbus/if_le_ledma.c +++ b/sys/dev/sbus/if_le_ledma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_ledma.c,v 1.17 2013/09/24 20:11:04 miod Exp $ */ +/* $OpenBSD: if_le_ledma.c,v 1.18 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: if_le_ledma.c,v 1.14 2001/05/30 11:46:35 mrg Exp $ */ /*- @@ -44,10 +44,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/sbus/qe.c b/sys/dev/sbus/qe.c index eb501c0837f..ce51ab3535f 100644 --- a/sys/dev/sbus/qe.c +++ b/sys/dev/sbus/qe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qe.c,v 1.26 2014/08/11 12:45:45 mpi Exp $ */ +/* $OpenBSD: qe.c,v 1.27 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: qe.c,v 1.16 2001/03/30 17:30:18 christos Exp $ */ /*- @@ -904,12 +904,10 @@ qeioctl(ifp, cmd, data) case SIOCSIFADDR: ifp->if_flags |= IFF_UP; switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: qeinit(sc); arp_ifinit(&sc->sc_arpcom, ifa); break; -#endif /* INET */ default: qeinit(sc); break; diff --git a/sys/dev/tc/if_le_ioasic.c b/sys/dev/tc/if_le_ioasic.c index 8f12e7bc385..a7a87ecca8e 100644 --- a/sys/dev/tc/if_le_ioasic.c +++ b/sys/dev/tc/if_le_ioasic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_ioasic.c,v 1.16 2013/09/24 20:11:05 miod Exp $ */ +/* $OpenBSD: if_le_ioasic.c,v 1.17 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: if_le_ioasic.c,v 1.18 2001/11/13 06:26:10 lukem Exp $ */ /* @@ -42,10 +42,8 @@ #include <net/if.h> #include <net/if_media.h> -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <dev/ic/lancereg.h> #include <dev/ic/lancevar.h> diff --git a/sys/dev/tc/if_le_tc.c b/sys/dev/tc/if_le_tc.c index 81e660e8144..73f82406514 100644 --- a/sys/dev/tc/if_le_tc.c +++ b/sys/dev/tc/if_le_tc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_tc.c,v 1.11 2013/09/24 20:11:05 miod Exp $ */ +/* $OpenBSD: if_le_tc.c,v 1.12 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: if_le_tc.c,v 1.12 2001/11/13 06:26:10 lukem Exp $ */ /* @@ -42,10 +42,8 @@ #include <net/if.h> #include <net/if_media.h> -#ifdef INET #include <netinet/in.h> #include <netinet/if_ether.h> -#endif #include <dev/ic/lancereg.h> #include <dev/ic/lancevar.h> diff --git a/sys/dev/usb/if_athn_usb.c b/sys/dev/usb/if_athn_usb.c index 378e2c76ed4..52880fc7c66 100644 --- a/sys/dev/usb/if_athn_usb.c +++ b/sys/dev/usb/if_athn_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_athn_usb.c,v 1.24 2014/12/19 22:44:59 guenther Exp $ */ +/* $OpenBSD: if_athn_usb.c,v 1.25 2014/12/22 02:28:52 tedu Exp $ */ /*- * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr> @@ -2060,10 +2060,8 @@ athn_usb_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/usb/if_atu.c b/sys/dev/usb/if_atu.c index fa25d4e4a49..d39adb9fd73 100644 --- a/sys/dev/usb/if_atu.c +++ b/sys/dev/usb/if_atu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atu.c,v 1.109 2014/07/13 15:52:49 mpi Exp $ */ +/* $OpenBSD: if_atu.c,v 1.110 2014/12/22 02:28:52 tedu Exp $ */ /* * Copyright (c) 2003, 2004 * Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved. @@ -2127,11 +2127,9 @@ atu_ioctl(struct ifnet *ifp, u_long command, caddr_t data) atu_init(ifp); switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: arp_ifinit(&sc->sc_ic.ic_ac, ifa); break; -#endif /* INET */ } break; diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index 1f6bd701d35..7b12492fd77 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_aue.c,v 1.94 2014/07/13 15:52:49 mpi Exp $ */ +/* $OpenBSD: if_aue.c,v 1.95 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1481,10 +1481,8 @@ aue_ioctl(struct ifnet *ifp, u_long command, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) aue_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/usb/if_axe.c b/sys/dev/usb/if_axe.c index 2a0c5e0e924..f3ca9500d70 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_axe.c,v 1.127 2014/11/24 02:03:37 brad Exp $ */ +/* $OpenBSD: if_axe.c,v 1.128 2014/12/22 02:28:52 tedu Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org> @@ -1395,10 +1395,8 @@ axe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) axe_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/usb/if_axen.c b/sys/dev/usb/if_axen.c index 2dc0cc00813..b6afae1bfc4 100644 --- a/sys/dev/usb/if_axen.c +++ b/sys/dev/usb/if_axen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_axen.c,v 1.8 2014/07/13 15:52:49 mpi Exp $ */ +/* $OpenBSD: if_axen.c,v 1.9 2014/12/22 02:28:52 tedu Exp $ */ /* * Copyright (c) 2013 Yojiro UO <yuo@openbsd.org> @@ -1401,10 +1401,8 @@ axen_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) axen_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/usb/if_cdce.c b/sys/dev/usb/if_cdce.c index abd0de9fa28..f52726a6ba9 100644 --- a/sys/dev/usb/if_cdce.c +++ b/sys/dev/usb/if_cdce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cdce.c,v 1.61 2014/07/13 15:52:49 mpi Exp $ */ +/* $OpenBSD: if_cdce.c,v 1.62 2014/12/22 02:28:52 tedu Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com> @@ -523,10 +523,8 @@ cdce_ioctl(struct ifnet *ifp, u_long command, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) cdce_init(sc); -#ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) arp_ifinit(&sc->cdce_arpcom, ifa); -#endif break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_cdcef.c b/sys/dev/usb/if_cdcef.c index ee80d9e9f69..998c8c43c80 100644 --- a/sys/dev/usb/if_cdcef.c +++ b/sys/dev/usb/if_cdcef.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cdcef.c,v 1.34 2014/07/13 15:52:49 mpi Exp $ */ +/* $OpenBSD: if_cdcef.c,v 1.35 2014/12/22 02:28:52 tedu Exp $ */ /* * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org> @@ -476,10 +476,8 @@ cdcef_ioctl(struct ifnet *ifp, u_long command, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) cdcef_init(sc); -#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/usb/if_cue.c b/sys/dev/usb/if_cue.c index 50603781ff6..b5101588332 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cue.c,v 1.66 2014/07/13 15:52:49 mpi Exp $ */ +/* $OpenBSD: if_cue.c,v 1.67 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1073,11 +1073,9 @@ cue_ioctl(struct ifnet *ifp, u_long command, caddr_t data) cue_init(sc); switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: arp_ifinit(&sc->arpcom, ifa); break; -#endif /* INET */ } break; diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index fea1a45c261..fc4503dd04c 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_kue.c,v 1.74 2014/07/13 15:52:49 mpi Exp $ */ +/* $OpenBSD: if_kue.c,v 1.75 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1039,11 +1039,9 @@ kue_ioctl(struct ifnet *ifp, u_long command, caddr_t data) kue_init(sc); switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: arp_ifinit(&sc->arpcom, ifa); break; -#endif /* INET */ } break; diff --git a/sys/dev/usb/if_mos.c b/sys/dev/usb/if_mos.c index bfe6c7b232a..51d6d05a866 100644 --- a/sys/dev/usb/if_mos.c +++ b/sys/dev/usb/if_mos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mos.c,v 1.26 2014/07/13 15:52:49 mpi Exp $ */ +/* $OpenBSD: if_mos.c,v 1.27 2014/12/22 02:28:52 tedu Exp $ */ /* * Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net> @@ -1279,10 +1279,8 @@ mos_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) mos_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/usb/if_otus.c b/sys/dev/usb/if_otus.c index 2c148fcc028..449cca3b3c2 100644 --- a/sys/dev/usb/if_otus.c +++ b/sys/dev/usb/if_otus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_otus.c,v 1.43 2014/12/19 22:44:59 guenther Exp $ */ +/* $OpenBSD: if_otus.c,v 1.44 2014/12/22 02:28:52 tedu Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -1491,10 +1491,8 @@ otus_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/usb/if_ral.c b/sys/dev/usb/if_ral.c index 345da1f3972..debea192c77 100644 --- a/sys/dev/usb/if_ral.c +++ b/sys/dev/usb/if_ral.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral.c,v 1.129 2014/12/19 22:44:59 guenther Exp $ */ +/* $OpenBSD: if_ral.c,v 1.130 2014/12/22 02:28:52 tedu Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -1331,10 +1331,8 @@ ural_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/usb/if_rsu.c b/sys/dev/usb/if_rsu.c index 2cea40a00a1..85477185051 100644 --- a/sys/dev/usb/if_rsu.c +++ b/sys/dev/usb/if_rsu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rsu.c,v 1.23 2014/12/19 22:44:59 guenther Exp $ */ +/* $OpenBSD: if_rsu.c,v 1.24 2014/12/22 02:28:52 tedu Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -1695,10 +1695,8 @@ rsu_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/usb/if_rum.c b/sys/dev/usb/if_rum.c index b9c4ba3076e..fea05a45958 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rum.c,v 1.107 2014/12/19 22:44:59 guenther Exp $ */ +/* $OpenBSD: if_rum.c,v 1.108 2014/12/22 02:28:52 tedu Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr> @@ -1350,10 +1350,8 @@ rum_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/usb/if_run.c b/sys/dev/usb/if_run.c index f68847352d9..28ac71a5cf9 100644 --- a/sys/dev/usb/if_run.c +++ b/sys/dev/usb/if_run.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_run.c,v 1.105 2014/12/19 22:44:59 guenther Exp $ */ +/* $OpenBSD: if_run.c,v 1.106 2014/12/22 02:28:52 tedu Exp $ */ /*- * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -2616,10 +2616,8 @@ run_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/usb/if_smsc.c b/sys/dev/usb/if_smsc.c index b54a3a4bee5..44875f4d4a3 100644 --- a/sys/dev/usb/if_smsc.c +++ b/sys/dev/usb/if_smsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_smsc.c,v 1.13 2014/07/13 15:52:49 mpi Exp $ */ +/* $OpenBSD: if_smsc.c,v 1.14 2014/12/22 02:28:52 tedu Exp $ */ /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */ /*- * Copyright (c) 2012 @@ -81,10 +81,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> @@ -873,10 +871,8 @@ smsc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) smsc_init(sc); -#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/usb/if_uath.c b/sys/dev/usb/if_uath.c index 09b73f08978..6fd5fe813a0 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.64 2014/12/19 22:44:59 guenther Exp $ */ +/* $OpenBSD: if_uath.c,v 1.65 2014/12/22 02:28:52 tedu Exp $ */ /*- * Copyright (c) 2006 @@ -1558,10 +1558,8 @@ uath_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/usb/if_udav.c b/sys/dev/usb/if_udav.c index 8887f39d070..9706de0c973 100644 --- a/sys/dev/usb/if_udav.c +++ b/sys/dev/usb/if_udav.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_udav.c,v 1.67 2014/07/13 15:52:49 mpi Exp $ */ +/* $OpenBSD: if_udav.c,v 1.68 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ /* @@ -1176,10 +1176,8 @@ udav_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) if (!(ifp->if_flags & IFF_RUNNING)) udav_init(ifp); -#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/usb/if_ugl.c b/sys/dev/usb/if_ugl.c index 45894003bd3..fca697d1983 100644 --- a/sys/dev/usb/if_ugl.c +++ b/sys/dev/usb/if_ugl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ugl.c,v 1.7 2014/07/13 15:52:49 mpi Exp $ */ +/* $OpenBSD: if_ugl.c,v 1.8 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 2013 SASANO Takayoshi <uaa@uaa.org.uk> @@ -815,10 +815,8 @@ ugl_ioctl(struct ifnet *ifp, u_long command, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) ugl_init(sc); -#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/usb/if_upgt.c b/sys/dev/usb/if_upgt.c index 605f6ac6251..5a237466ab2 100644 --- a/sys/dev/usb/if_upgt.c +++ b/sys/dev/usb/if_upgt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upgt.c,v 1.65 2014/12/19 22:44:59 guenther Exp $ */ +/* $OpenBSD: if_upgt.c,v 1.66 2014/12/22 02:28:52 tedu Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -1151,10 +1151,8 @@ upgt_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/usb/if_upl.c b/sys/dev/usb/if_upl.c index c0fdcc7dcf3..cf6cf352179 100644 --- a/sys/dev/usb/if_upl.c +++ b/sys/dev/usb/if_upl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upl.c,v 1.58 2014/07/13 15:52:49 mpi Exp $ */ +/* $OpenBSD: if_upl.c,v 1.59 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -784,10 +784,8 @@ upl_ioctl(struct ifnet *ifp, u_long command, caddr_t data) upl_init(sc); switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: break; -#endif /* INET */ } break; diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index 29a22da1a71..90f3154febd 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_url.c,v 1.70 2014/07/13 15:52:49 mpi Exp $ */ +/* $OpenBSD: if_url.c,v 1.71 2014/12/22 02:28:52 tedu Exp $ */ /* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */ /* * Copyright (c) 2001, 2002 @@ -1024,10 +1024,8 @@ url_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) url_init(ifp); -#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/usb/if_urndis.c b/sys/dev/usb/if_urndis.c index e4a115480c4..3c3a890edc9 100644 --- a/sys/dev/usb/if_urndis.c +++ b/sys/dev/usb/if_urndis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urndis.c,v 1.50 2014/11/30 21:45:04 kettenis Exp $ */ +/* $OpenBSD: if_urndis.c,v 1.51 2014/12/22 02:28:52 tedu Exp $ */ /* * Copyright (c) 2010 Jonathan Armani <armani@openbsd.org> @@ -990,10 +990,8 @@ urndis_ioctl(struct ifnet *ifp, u_long command, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) urndis_init(sc); -#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/usb/if_urtw.c b/sys/dev/usb/if_urtw.c index 557a0bb37e0..4c169b38750 100644 --- a/sys/dev/usb/if_urtw.c +++ b/sys/dev/usb/if_urtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtw.c,v 1.49 2014/12/19 22:44:59 guenther Exp $ */ +/* $OpenBSD: if_urtw.c,v 1.50 2014/12/22 02:28:52 tedu Exp $ */ /*- * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org> @@ -2377,10 +2377,8 @@ urtw_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/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c index 6f0f3c139f9..56ef2b820ab 100644 --- a/sys/dev/usb/if_urtwn.c +++ b/sys/dev/usb/if_urtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtwn.c,v 1.39 2014/12/19 22:44:59 guenther Exp $ */ +/* $OpenBSD: if_urtwn.c,v 1.40 2014/12/22 02:28:52 tedu Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -1970,10 +1970,8 @@ urtwn_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/usb/if_zyd.c b/sys/dev/usb/if_zyd.c index 88a161f45c8..74e7c6230a5 100644 --- a/sys/dev/usb/if_zyd.c +++ b/sys/dev/usb/if_zyd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_zyd.c,v 1.105 2014/12/19 22:44:59 guenther Exp $ */ +/* $OpenBSD: if_zyd.c,v 1.106 2014/12/22 02:28:52 tedu Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> @@ -2314,10 +2314,8 @@ zyd_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) { |