summaryrefslogtreecommitdiffstats
path: root/sys/dev/isa
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2014-12-22 02:28:51 +0000
committertedu <tedu@openbsd.org>2014-12-22 02:28:51 +0000
commitf79ee556e9e46e9a5a856c2be90b8430b83b910c (patch)
treef2b6ef1d0da7f6fe39086ee700534107c2b455d2 /sys/dev/isa
parentunifdef INET (diff)
downloadwireguard-openbsd-f79ee556e9e46e9a5a856c2be90b8430b83b910c.tar.xz
wireguard-openbsd-f79ee556e9e46e9a5a856c2be90b8430b83b910c.zip
unifdef INET
Diffstat (limited to 'sys/dev/isa')
-rw-r--r--sys/dev/isa/if_ef_isapnp.c4
-rw-r--r--sys/dev/isa/if_eg.c4
-rw-r--r--sys/dev/isa/if_el.c4
-rw-r--r--sys/dev/isa/if_ex.c6
-rw-r--r--sys/dev/isa/if_ie.c4
-rw-r--r--sys/dev/isa/if_le.c4
-rw-r--r--sys/dev/isa/if_le_isa.c4
-rw-r--r--sys/dev/isa/if_le_isapnp.c4
8 files changed, 8 insertions, 26 deletions
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>