summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-12-22 02:28:53 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-12-22 02:28:53 +0000
commitc7aed26ec28e1a2a8728d1471296eb8e7cd14ba7 (patch)
tree8f98dae088f7f5ae2df3690677f1c271ac8c7a51 /sys/dev/usb
parentf5060714df0f00e45a9c7091f8f8706f7225b547 (diff)
unifdef INET
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/if_athn_usb.c4
-rw-r--r--sys/dev/usb/if_atu.c4
-rw-r--r--sys/dev/usb/if_aue.c4
-rw-r--r--sys/dev/usb/if_axe.c4
-rw-r--r--sys/dev/usb/if_axen.c4
-rw-r--r--sys/dev/usb/if_cdce.c4
-rw-r--r--sys/dev/usb/if_cdcef.c4
-rw-r--r--sys/dev/usb/if_cue.c4
-rw-r--r--sys/dev/usb/if_kue.c4
-rw-r--r--sys/dev/usb/if_mos.c4
-rw-r--r--sys/dev/usb/if_otus.c4
-rw-r--r--sys/dev/usb/if_ral.c4
-rw-r--r--sys/dev/usb/if_rsu.c4
-rw-r--r--sys/dev/usb/if_rum.c4
-rw-r--r--sys/dev/usb/if_run.c4
-rw-r--r--sys/dev/usb/if_smsc.c6
-rw-r--r--sys/dev/usb/if_uath.c4
-rw-r--r--sys/dev/usb/if_udav.c4
-rw-r--r--sys/dev/usb/if_ugl.c4
-rw-r--r--sys/dev/usb/if_upgt.c4
-rw-r--r--sys/dev/usb/if_upl.c4
-rw-r--r--sys/dev/usb/if_url.c4
-rw-r--r--sys/dev/usb/if_urndis.c4
-rw-r--r--sys/dev/usb/if_urtw.c4
-rw-r--r--sys/dev/usb/if_urtwn.c4
-rw-r--r--sys/dev/usb/if_zyd.c4
26 files changed, 26 insertions, 80 deletions
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) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 23:12:06 +0000