From eed2c93ae73cd4850523de75bbb066eed4ba7e99 Mon Sep 17 00:00:00 2001 From: tedu Date: Mon, 22 Dec 2014 02:26:53 +0000 Subject: [PATCH] unifdef INET --- sys/arch/arm/arm/in_cksum_arm.S | 4 +--- sys/arch/armv7/imx/imxenet.c | 4 +--- sys/arch/armv7/omap/if_cpsw.c | 4 +--- sys/arch/armv7/sunxi/sxie.c | 4 +--- sys/arch/aviion/dev/if_le_syscon.c | 4 +--- sys/arch/aviion/dev/if_le_vme.c | 4 +--- sys/arch/i386/i386/genassym.cf | 6 +----- sys/arch/luna88k/dev/if_le.c | 4 +--- sys/arch/macppc/dev/if_bm.c | 4 +--- sys/arch/macppc/dev/if_mc.c | 4 +--- sys/arch/macppc/dev/if_wi_obio.c | 4 +--- sys/arch/octeon/dev/if_cnmac.c | 4 +--- sys/arch/sgi/dev/if_iec.c | 4 +--- sys/arch/sgi/dev/if_mec.c | 4 +--- sys/arch/sgi/hpc/if_sq.c | 4 +--- sys/arch/socppc/dev/if_tsec.c | 6 +----- sys/arch/sparc/dev/be.c | 4 +--- sys/arch/sparc/dev/hme.c | 4 +--- sys/arch/sparc/dev/if_ie.c | 4 +--- sys/arch/sparc/dev/if_le.c | 4 +--- sys/arch/sparc/dev/qe.c | 4 +--- sys/arch/sparc64/dev/vnet.c | 4 +--- sys/arch/vax/if/if_de.c | 6 +----- sys/arch/vax/if/if_le.c | 4 +--- sys/arch/vax/if/if_qe.c | 4 +--- sys/arch/vax/if/sgec.c | 4 +--- sys/arch/vax/mbus/if_le_fwio.c | 4 +--- sys/arch/vax/vax/machdep.c | 4 +--- sys/arch/vax/vsa/if_le_vsbus.c | 4 +--- 29 files changed, 29 insertions(+), 93 deletions(-) diff --git a/sys/arch/arm/arm/in_cksum_arm.S b/sys/arch/arm/arm/in_cksum_arm.S index f706c3c9922..1894105210f 100644 --- a/sys/arch/arm/arm/in_cksum_arm.S +++ b/sys/arch/arm/arm/in_cksum_arm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: in_cksum_arm.S,v 1.3 2011/11/08 17:06:51 deraadt Exp $ */ +/* $OpenBSD: in_cksum_arm.S,v 1.4 2014/12/22 02:26:53 tedu Exp $ */ /* $NetBSD: in_cksum_arm.S,v 1.3 2003/11/26 10:31:53 rearnsha Exp $ */ /* @@ -88,7 +88,6 @@ ENTRY(in_cksum) eor r0, r0, r1 ldmfd sp!, {r4-r11,pc} -#ifdef INET /* * int in4_cksum(struct mbuf *m, u_int8_t nxt, int off, int len) * @@ -202,7 +201,6 @@ ENTRY(in4_cksum) .Lin4_cksum_whoops_str: .asciz "in4_cksum: out of mbufs\n" .align 5 -#endif /* INET */ /* * The main in*_cksum() workhorse... diff --git a/sys/arch/armv7/imx/imxenet.c b/sys/arch/armv7/imx/imxenet.c index 784942c1c0f..a9e556d9bee 100644 --- a/sys/arch/armv7/imx/imxenet.c +++ b/sys/arch/armv7/imx/imxenet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imxenet.c,v 1.7 2014/08/21 14:24:08 mpi Exp $ */ +/* $OpenBSD: imxenet.c,v 1.8 2014/12/22 02:26:53 tedu Exp $ */ /* * Copyright (c) 2012-2013 Patrick Wildt * @@ -607,10 +607,8 @@ imxenet_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) imxenet_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/arch/armv7/omap/if_cpsw.c b/sys/arch/armv7/omap/if_cpsw.c index 4f2992ef70d..b720b754328 100644 --- a/sys/arch/armv7/omap/if_cpsw.c +++ b/sys/arch/armv7/omap/if_cpsw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cpsw.c,v 1.23 2014/08/18 17:56:45 miod Exp $ */ +/* $OpenBSD: if_cpsw.c,v 1.24 2014/12/22 02:26:53 tedu Exp $ */ /* $NetBSD: if_cpsw.c,v 1.3 2013/04/17 14:36:34 bouyer Exp $ */ /* @@ -575,10 +575,8 @@ cpsw_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 case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { diff --git a/sys/arch/armv7/sunxi/sxie.c b/sys/arch/armv7/sunxi/sxie.c index c0283796c77..28faa411dd7 100644 --- a/sys/arch/armv7/sunxi/sxie.c +++ b/sys/arch/armv7/sunxi/sxie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sxie.c,v 1.6 2014/08/21 14:24:08 mpi Exp $ */ +/* $OpenBSD: sxie.c,v 1.7 2014/12/22 02:26:53 tedu Exp $ */ /* * Copyright (c) 2012-2013 Patrick Wildt * Copyright (c) 2013 Artturi Alm @@ -641,10 +641,8 @@ sxie_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; sxie_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) { diff --git a/sys/arch/aviion/dev/if_le_syscon.c b/sys/arch/aviion/dev/if_le_syscon.c index a6636023c43..86a22b639eb 100644 --- a/sys/arch/aviion/dev/if_le_syscon.c +++ b/sys/arch/aviion/dev/if_le_syscon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_syscon.c,v 1.16 2014/11/16 12:30:56 deraadt Exp $ */ +/* $OpenBSD: if_le_syscon.c,v 1.17 2014/12/22 02:26:53 tedu Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -40,10 +40,8 @@ #include -#ifdef INET #include #include -#endif #include diff --git a/sys/arch/aviion/dev/if_le_vme.c b/sys/arch/aviion/dev/if_le_vme.c index 149a0140537..ff0922528b0 100644 --- a/sys/arch/aviion/dev/if_le_vme.c +++ b/sys/arch/aviion/dev/if_le_vme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_vme.c,v 1.4 2013/09/24 20:14:34 miod Exp $ */ +/* $OpenBSD: if_le_vme.c,v 1.5 2014/12/22 02:26:53 tedu Exp $ */ /*- * Copyright (c) 1982, 1992, 1993 @@ -41,10 +41,8 @@ #include -#ifdef INET #include #include -#endif #include diff --git a/sys/arch/i386/i386/genassym.cf b/sys/arch/i386/i386/genassym.cf index 81e0be6fecf..a89b0c0fd70 100644 --- a/sys/arch/i386/i386/genassym.cf +++ b/sys/arch/i386/i386/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.35 2014/07/22 10:35:34 mpi Exp $ +# $OpenBSD: genassym.cf,v 1.36 2014/12/22 02:26:53 tedu Exp $ # # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -35,13 +35,11 @@ include include include include -ifdef INET include include include include include -endif include @@ -130,12 +128,10 @@ member SC sf_sc struct sigcontext # mbuf fields -ifdef INET struct mbuf member m_next member m_data member m_len -endif # Linux frame offsets ifdef COMPAT_LINUX diff --git a/sys/arch/luna88k/dev/if_le.c b/sys/arch/luna88k/dev/if_le.c index 74a2dd66898..7b22b52d88d 100644 --- a/sys/arch/luna88k/dev/if_le.c +++ b/sys/arch/luna88k/dev/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.7 2014/09/27 06:23:30 aoyama Exp $ */ +/* $OpenBSD: if_le.c,v 1.8 2014/12/22 02:26:53 tedu Exp $ */ /* $NetBSD: if_le.c,v 1.33 1996/11/20 18:56:52 gwr Exp $ */ /*- @@ -41,10 +41,8 @@ #include -#ifdef INET #include #include -#endif #include diff --git a/sys/arch/macppc/dev/if_bm.c b/sys/arch/macppc/dev/if_bm.c index f64df84891e..2da23be90d9 100644 --- a/sys/arch/macppc/dev/if_bm.c +++ b/sys/arch/macppc/dev/if_bm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bm.c,v 1.28 2013/10/23 10:31:19 mpi Exp $ */ +/* $OpenBSD: if_bm.c,v 1.29 2014/12/22 02:26:53 tedu Exp $ */ /* $NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $ */ /*- @@ -757,12 +757,10 @@ bmac_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: bmac_init(sc); arp_ifinit(&sc->arpcom, ifa); break; -#endif default: bmac_init(sc); break; diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c index afdc9fad62c..55c6ec0a06b 100644 --- a/sys/arch/macppc/dev/if_mc.c +++ b/sys/arch/macppc/dev/if_mc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mc.c,v 1.17 2014/07/22 10:35:35 mpi Exp $ */ +/* $OpenBSD: if_mc.c,v 1.18 2014/12/22 02:26:53 tedu Exp $ */ /* $NetBSD: if_mc.c,v 1.9.16.1 2006/06/21 14:53:13 yamt Exp $ */ /*- @@ -499,10 +499,8 @@ mc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) mc_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/arch/macppc/dev/if_wi_obio.c b/sys/arch/macppc/dev/if_wi_obio.c index 73a7512b6ba..64be2e5d952 100644 --- a/sys/arch/macppc/dev/if_wi_obio.c +++ b/sys/arch/macppc/dev/if_wi_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_obio.c,v 1.17 2011/07/03 15:47:16 matthew Exp $ */ +/* $OpenBSD: if_wi_obio.c,v 1.18 2014/12/22 02:26:53 tedu Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -56,10 +56,8 @@ #include #include -#ifdef INET #include #include -#endif #include #include diff --git a/sys/arch/octeon/dev/if_cnmac.c b/sys/arch/octeon/dev/if_cnmac.c index 85f67700c6e..d0d9d58ca0b 100644 --- a/sys/arch/octeon/dev/if_cnmac.c +++ b/sys/arch/octeon/dev/if_cnmac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cnmac.c,v 1.20 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: if_cnmac.c,v 1.21 2014/12/22 02:26:53 tedu Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -758,10 +758,8 @@ octeon_eth_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) octeon_eth_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/arch/sgi/dev/if_iec.c b/sys/arch/sgi/dev/if_iec.c index 5f917582b20..74d099ef80f 100644 --- a/sys/arch/sgi/dev/if_iec.c +++ b/sys/arch/sgi/dev/if_iec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iec.c,v 1.11 2014/07/22 10:35:35 mpi Exp $ */ +/* $OpenBSD: if_iec.c,v 1.12 2014/12/22 02:26:53 tedu Exp $ */ /* * Copyright (c) 2009 Miodrag Vallat. @@ -1026,10 +1026,8 @@ iec_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) iec_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/arch/sgi/dev/if_mec.c b/sys/arch/sgi/dev/if_mec.c index b030a0c2c86..a0246a2c9d5 100644 --- a/sys/arch/sgi/dev/if_mec.c +++ b/sys/arch/sgi/dev/if_mec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mec.c,v 1.27 2014/07/22 10:35:35 mpi Exp $ */ +/* $OpenBSD: if_mec.c,v 1.28 2014/12/22 02:26:53 tedu Exp $ */ /* $NetBSD: if_mec_mace.c,v 1.5 2004/08/01 06:36:36 tsutsui Exp $ */ /* @@ -1036,10 +1036,8 @@ mec_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) mec_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/arch/sgi/hpc/if_sq.c b/sys/arch/sgi/hpc/if_sq.c index d1cc5506823..ef10bf27ccf 100644 --- a/sys/arch/sgi/hpc/if_sq.c +++ b/sys/arch/sgi/hpc/if_sq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sq.c,v 1.11 2014/08/27 02:10:24 brad Exp $ */ +/* $OpenBSD: if_sq.c,v 1.12 2014/12/22 02:26:53 tedu Exp $ */ /* $NetBSD: if_sq.c,v 1.42 2011/07/01 18:53:47 dyoung Exp $ */ /* @@ -610,10 +610,8 @@ sq_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) sq_init(ifp); -#ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) arp_ifinit(&sc->sc_ac, ifa); -#endif break; case SIOCSIFMEDIA: diff --git a/sys/arch/socppc/dev/if_tsec.c b/sys/arch/socppc/dev/if_tsec.c index 1e06d91daa1..5cc4c220600 100644 --- a/sys/arch/socppc/dev/if_tsec.c +++ b/sys/arch/socppc/dev/if_tsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tsec.c,v 1.33 2014/11/30 01:24:15 brad Exp $ */ +/* $OpenBSD: if_tsec.c,v 1.34 2014/12/22 02:26:53 tedu Exp $ */ /* * Copyright (c) 2008 Mark Kettenis @@ -49,10 +49,8 @@ #include #endif -#ifdef INET #include #include -#endif extern void myetheraddr(u_char *); @@ -565,10 +563,8 @@ tsec_ioctl(struct ifnet *ifp, u_long cmd, caddr_t addr) 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/arch/sparc/dev/be.c b/sys/arch/sparc/dev/be.c index 08ced64a326..d694d1d537c 100644 --- a/sys/arch/sparc/dev/be.c +++ b/sys/arch/sparc/dev/be.c @@ -1,4 +1,4 @@ -/* $OpenBSD: be.c,v 1.47 2014/07/22 10:35:35 mpi Exp $ */ +/* $OpenBSD: be.c,v 1.48 2014/12/22 02:26:54 tedu Exp $ */ /* * Copyright (c) 1998 Theo de Raadt and Jason L. Wright. @@ -571,12 +571,10 @@ beioctl(ifp, cmd, 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/arch/sparc/dev/hme.c b/sys/arch/sparc/dev/hme.c index 834118955f2..c54cc48d66f 100644 --- a/sys/arch/sparc/dev/hme.c +++ b/sys/arch/sparc/dev/hme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hme.c,v 1.66 2014/07/22 10:35:35 mpi Exp $ */ +/* $OpenBSD: hme.c,v 1.67 2014/12/22 02:26:54 tedu Exp $ */ /* * Copyright (c) 1998 Jason L. Wright (jason@thought.net) @@ -406,10 +406,8 @@ hmeioctl(ifp, cmd, data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) hmeinit(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/arch/sparc/dev/if_ie.c b/sys/arch/sparc/dev/if_ie.c index 1dc5dad2d1f..27dce8a0519 100644 --- a/sys/arch/sparc/dev/if_ie.c +++ b/sys/arch/sparc/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.48 2014/11/16 12:30:58 deraadt Exp $ */ +/* $OpenBSD: if_ie.c,v 1.49 2014/12/22 02:26:54 tedu Exp $ */ /* $NetBSD: if_ie.c,v 1.33 1997/07/29 17:55:38 fair Exp $ */ /*- @@ -1949,12 +1949,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/arch/sparc/dev/if_le.c b/sys/arch/sparc/dev/if_le.c index a310c3cc52f..feaab59f2e2 100644 --- a/sys/arch/sparc/dev/if_le.c +++ b/sys/arch/sparc/dev/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.35 2014/07/28 18:31:39 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.36 2014/12/22 02:26:54 tedu Exp $ */ /* $NetBSD: if_le.c,v 1.50 1997/09/09 20:54:48 pk Exp $ */ /*- @@ -58,10 +58,8 @@ #include #include -#ifdef INET #include #include -#endif #include #include diff --git a/sys/arch/sparc/dev/qe.c b/sys/arch/sparc/dev/qe.c index 06c36cf6fa7..f80de7646d1 100644 --- a/sys/arch/sparc/dev/qe.c +++ b/sys/arch/sparc/dev/qe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qe.c,v 1.36 2014/07/22 10:35:35 mpi Exp $ */ +/* $OpenBSD: qe.c,v 1.37 2014/12/22 02:26:54 tedu Exp $ */ /* * Copyright (c) 1998, 2000 Jason L. Wright. @@ -591,12 +591,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/arch/sparc64/dev/vnet.c b/sys/arch/sparc64/dev/vnet.c index f2d1bd1c31a..d95c401f495 100644 --- a/sys/arch/sparc64/dev/vnet.c +++ b/sys/arch/sparc64/dev/vnet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vnet.c,v 1.35 2014/09/15 08:16:21 kettenis Exp $ */ +/* $OpenBSD: vnet.c,v 1.36 2014/12/22 02:26:54 tedu Exp $ */ /* * Copyright (c) 2009 Mark Kettenis * @@ -1223,10 +1223,8 @@ vnet_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/arch/vax/if/if_de.c b/sys/arch/vax/if/if_de.c index 0fb8fd41b05..a4a69a9e020 100644 --- a/sys/arch/vax/if/if_de.c +++ b/sys/arch/vax/if/if_de.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_de.c,v 1.25 2014/08/21 14:24:08 mpi Exp $ */ +/* $OpenBSD: if_de.c,v 1.26 2014/12/22 02:26:54 tedu Exp $ */ /* $NetBSD: if_de.c,v 1.27 1997/04/19 15:02:29 ragge Exp $ */ /* @@ -59,11 +59,9 @@ #include #include -#ifdef INET #include #include #include -#endif #include #include @@ -579,11 +577,9 @@ deioctl(ifp, cmd, data) deinit(ds); switch (ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: arp_ifinit(&ds->ds_ac, ifa); break; -#endif } break; diff --git a/sys/arch/vax/if/if_le.c b/sys/arch/vax/if/if_le.c index 6d639c4c81c..3d992fe985b 100644 --- a/sys/arch/vax/if/if_le.c +++ b/sys/arch/vax/if/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.18 2013/09/24 20:10:51 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.19 2014/12/22 02:26:54 tedu Exp $ */ /* $NetBSD: if_le.c,v 1.14 1999/08/14 18:40:23 ragge Exp $ */ /*- @@ -78,9 +78,7 @@ #include #include -#ifdef INET #include -#endif #include #include diff --git a/sys/arch/vax/if/if_qe.c b/sys/arch/vax/if/if_qe.c index 3af9c498e45..ebc8acdf500 100644 --- a/sys/arch/vax/if/if_qe.c +++ b/sys/arch/vax/if/if_qe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_qe.c,v 1.28 2014/08/06 15:40:40 jsg Exp $ */ +/* $OpenBSD: if_qe.c,v 1.29 2014/12/22 02:26:54 tedu Exp $ */ /* $NetBSD: if_qe.c,v 1.51 2002/06/08 12:28:37 ragge Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved. @@ -639,12 +639,10 @@ qeioctl(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: qeinit(sc); arp_ifinit(&sc->sc_ac, ifa); break; -#endif } break; diff --git a/sys/arch/vax/if/sgec.c b/sys/arch/vax/if/sgec.c index e8ae91d90e2..116e41fae56 100644 --- a/sys/arch/vax/if/sgec.c +++ b/sys/arch/vax/if/sgec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sgec.c,v 1.24 2014/08/14 17:49:50 miod Exp $ */ +/* $OpenBSD: sgec.c,v 1.25 2014/12/22 02:26:54 tedu Exp $ */ /* $NetBSD: sgec.c,v 1.5 2000/06/04 02:14:14 matt Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved. @@ -631,12 +631,10 @@ zeioctl(ifp, cmd, data) case SIOCSIFADDR: ifp->if_flags |= IFF_UP; switch(ifa->ifa_addr->sa_family) { -#ifdef INET case AF_INET: zeinit(sc); arp_ifinit(&sc->sc_ac, ifa); break; -#endif } break; diff --git a/sys/arch/vax/mbus/if_le_fwio.c b/sys/arch/vax/mbus/if_le_fwio.c index 36c9975b496..9b44644ed12 100644 --- a/sys/arch/vax/mbus/if_le_fwio.c +++ b/sys/arch/vax/mbus/if_le_fwio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_fwio.c,v 1.3 2013/09/24 20:10:52 miod Exp $ */ +/* $OpenBSD: if_le_fwio.c,v 1.4 2014/12/22 02:26:54 tedu Exp $ */ /* * Copyright (c) 2008 Miodrag Vallat. @@ -93,9 +93,7 @@ #include #include -#ifdef INET #include -#endif #include #include diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c index 649b6e7bf68..2c6ad2e6a1f 100644 --- a/sys/arch/vax/vax/machdep.c +++ b/sys/arch/vax/vax/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.146 2014/12/10 15:29:53 mikeb Exp $ */ +/* $OpenBSD: machdep.c,v 1.147 2014/12/22 02:26:54 tedu Exp $ */ /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */ /* @@ -77,10 +77,8 @@ #include #include -#ifdef INET #include #include -#endif #include "ppp.h" /* For NPPP */ #include "bridge.h" /* For NBRIDGE */ #if NPPP > 0 diff --git a/sys/arch/vax/vsa/if_le_vsbus.c b/sys/arch/vax/vsa/if_le_vsbus.c index fd4692d4113..59198c35815 100644 --- a/sys/arch/vax/vsa/if_le_vsbus.c +++ b/sys/arch/vax/vsa/if_le_vsbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_vsbus.c,v 1.14 2013/09/24 20:10:53 miod Exp $ */ +/* $OpenBSD: if_le_vsbus.c,v 1.15 2014/12/22 02:26:54 tedu Exp $ */ /* $NetBSD: if_le_vsbus.c,v 1.10 2000/06/29 07:14:18 mrg Exp $ */ /*- @@ -77,9 +77,7 @@ #include #include -#ifdef INET #include -#endif #include #include -- 2.20.1