From 81fda35555d54b236c258685388dee28c4c1fccb Mon Sep 17 00:00:00 2001 From: mpi Date: Sun, 25 Oct 2015 12:11:56 +0000 Subject: [PATCH] arp_ifinit() is no longer needed. --- sys/dev/usb/if_athn_usb.c | 6 +----- sys/dev/usb/if_atu.c | 10 +--------- sys/dev/usb/if_aue.c | 5 +---- sys/dev/usb/if_axe.c | 5 +---- sys/dev/usb/if_axen.c | 5 +---- sys/dev/usb/if_cdce.c | 5 +---- sys/dev/usb/if_cdcef.c | 5 +---- sys/dev/usb/if_cue.c | 9 +-------- sys/dev/usb/if_kue.c | 9 +-------- sys/dev/usb/if_mos.c | 5 +---- sys/dev/usb/if_otus.c | 6 +----- sys/dev/usb/if_ral.c | 6 +----- sys/dev/usb/if_rsu.c | 6 +----- sys/dev/usb/if_rum.c | 6 +----- sys/dev/usb/if_run.c | 6 +----- sys/dev/usb/if_smsc.c | 5 +---- sys/dev/usb/if_uath.c | 6 +----- sys/dev/usb/if_udav.c | 6 +----- sys/dev/usb/if_ugl.c | 5 +---- sys/dev/usb/if_upgt.c | 6 +----- sys/dev/usb/if_url.c | 5 +---- sys/dev/usb/if_urndis.c | 5 +---- sys/dev/usb/if_urtw.c | 6 +----- sys/dev/usb/if_urtwn.c | 6 +----- sys/dev/usb/if_zyd.c | 6 +----- 25 files changed, 25 insertions(+), 125 deletions(-) diff --git a/sys/dev/usb/if_athn_usb.c b/sys/dev/usb/if_athn_usb.c index f16c6632003..e35a21e8b8a 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.36 2015/07/09 16:33:42 stsp Exp $ */ +/* $OpenBSD: if_athn_usb.c,v 1.37 2015/10/25 12:11:56 mpi Exp $ */ /*- * Copyright (c) 2011 Damien Bergamini @@ -2124,7 +2124,6 @@ athn_usb_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) struct athn_softc *sc = ifp->if_softc; struct athn_usb_softc *usc = (struct athn_usb_softc *)sc; struct ieee80211com *ic = &sc->sc_ic; - struct ifaddr *ifa; struct ifreq *ifr; int s, error = 0; @@ -2137,10 +2136,7 @@ athn_usb_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) switch (cmd) { case SIOCSIFADDR: - ifa = (struct ifaddr *)data; ifp->if_flags |= IFF_UP; - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&ic->ic_ac, ifa); /* 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 6423773fbf4..a6bfdee6901 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.112 2015/06/24 09:40:54 mpi Exp $ */ +/* $OpenBSD: if_atu.c,v 1.113 2015/10/25 12:11:56 mpi Exp $ */ /* * Copyright (c) 2003, 2004 * Daan Vreeken . All rights reserved. @@ -2111,7 +2111,6 @@ int atu_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { struct atu_softc *sc = ifp->if_softc; - struct ifaddr *ifa; int err = 0, s; s = splnet(); @@ -2119,15 +2118,8 @@ atu_ioctl(struct ifnet *ifp, u_long command, caddr_t data) case SIOCSIFADDR: DPRINTFN(15, ("%s: SIOCSIFADDR\n", sc->atu_dev.dv_xname)); - ifa = (struct ifaddr *)data; ifp->if_flags |= IFF_UP; atu_init(ifp); - - switch (ifa->ifa_addr->sa_family) { - case AF_INET: - arp_ifinit(&sc->sc_ic.ic_ac, ifa); - break; - } break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index 126de08da56..f65900d2c73 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.100 2015/06/24 09:40:54 mpi Exp $ */ +/* $OpenBSD: if_aue.c,v 1.101 2015/10/25 12:11:56 mpi Exp $ */ /* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1429,7 +1429,6 @@ int aue_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { struct aue_softc *sc = ifp->if_softc; - struct ifaddr *ifa = (struct ifaddr *)data; struct ifreq *ifr = (struct ifreq *)data; int s, error = 0; @@ -1443,8 +1442,6 @@ 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); - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&sc->arpcom, ifa); break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index c86d8eb3045..0f39523f49d 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.132 2015/06/24 09:40:54 mpi Exp $ */ +/* $OpenBSD: if_axe.c,v 1.133 2015/10/25 12:11:56 mpi Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Jonathan Gray @@ -1392,7 +1392,6 @@ axe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct axe_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; - struct ifaddr *ifa = (struct ifaddr *)data; int s, error = 0; s = splnet(); @@ -1402,8 +1401,6 @@ 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); - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&sc->arpcom, ifa); break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_axen.c b/sys/dev/usb/if_axen.c index cb761ab06c0..2e84cbe50b5 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.16 2015/07/16 00:35:06 yuo Exp $ */ +/* $OpenBSD: if_axen.c,v 1.17 2015/10/25 12:11:56 mpi Exp $ */ /* * Copyright (c) 2013 Yojiro UO @@ -1393,7 +1393,6 @@ axen_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct axen_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; - struct ifaddr *ifa = (struct ifaddr *)data; int s; int error = 0; @@ -1404,8 +1403,6 @@ 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); - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&sc->arpcom, ifa); break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c index d0b458588ae..596371f65ca 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.65 2015/06/24 09:40:54 mpi Exp $ */ +/* $OpenBSD: if_cdce.c,v 1.66 2015/10/25 12:11:56 mpi Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul @@ -509,7 +509,6 @@ int cdce_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { struct cdce_softc *sc = ifp->if_softc; - struct ifaddr *ifa = (struct ifaddr *)data; int s, error = 0; if (usbd_is_dying(sc->cdce_udev)) @@ -522,8 +521,6 @@ 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); - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&sc->cdce_arpcom, ifa); break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_cdcef.c b/sys/dev/usb/if_cdcef.c index 1fe0adc8205..8b32dfec7fe 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.37 2015/06/24 09:40:54 mpi Exp $ */ +/* $OpenBSD: if_cdcef.c,v 1.38 2015/10/25 12:11:56 mpi Exp $ */ /* * Copyright (c) 2007 Dale Rahn @@ -458,7 +458,6 @@ int cdcef_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { struct cdcef_softc *sc = ifp->if_softc; - struct ifaddr *ifa = (struct ifaddr *)data; int s, error = 0; s = splnet(); @@ -468,8 +467,6 @@ 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); - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&sc->sc_arpcom, ifa); break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index 9c62e5fa436..e4c17ddb7c9 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.71 2015/06/24 09:40:54 mpi Exp $ */ +/* $OpenBSD: if_cue.c,v 1.72 2015/10/25 12:11:56 mpi Exp $ */ /* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1041,7 +1041,6 @@ int cue_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { struct cue_softc *sc = ifp->if_softc; - struct ifaddr *ifa = (struct ifaddr *)data; int s, error = 0; if (usbd_is_dying(sc->cue_udev)) @@ -1053,12 +1052,6 @@ cue_ioctl(struct ifnet *ifp, u_long command, caddr_t data) case SIOCSIFADDR: ifp->if_flags |= IFF_UP; cue_init(sc); - - switch (ifa->ifa_addr->sa_family) { - case AF_INET: - arp_ifinit(&sc->arpcom, ifa); - break; - } break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index 9881333159e..5abe5cf9729 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.80 2015/06/24 09:40:54 mpi Exp $ */ +/* $OpenBSD: if_kue.c,v 1.81 2015/10/25 12:11:56 mpi Exp $ */ /* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -998,7 +998,6 @@ int kue_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { struct kue_softc *sc = ifp->if_softc; - struct ifaddr *ifa = (struct ifaddr *)data; int s, error = 0; DPRINTFN(5,("%s: %s: enter\n", sc->kue_dev.dv_xname,__func__)); @@ -1019,12 +1018,6 @@ kue_ioctl(struct ifnet *ifp, u_long command, caddr_t data) case SIOCSIFADDR: ifp->if_flags |= IFF_UP; kue_init(sc); - - switch (ifa->ifa_addr->sa_family) { - case AF_INET: - arp_ifinit(&sc->arpcom, ifa); - break; - } break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_mos.c b/sys/dev/usb/if_mos.c index b0a737deb7c..3d41c10a20e 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.31 2015/06/24 09:40:54 mpi Exp $ */ +/* $OpenBSD: if_mos.c,v 1.32 2015/10/25 12:11:56 mpi Exp $ */ /* * Copyright (c) 2008 Johann Christian Rode @@ -1263,7 +1263,6 @@ mos_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct mos_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; - struct ifaddr *ifa = (struct ifaddr *)data; int s, error = 0; s = splnet(); @@ -1273,8 +1272,6 @@ 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); - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&sc->arpcom, ifa); break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c index 7b722e47be5..1e7c2a35f36 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.46 2015/03/14 03:38:49 jsg Exp $ */ +/* $OpenBSD: if_otus.c,v 1.47 2015/10/25 12:11:56 mpi Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini @@ -1474,7 +1474,6 @@ otus_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct otus_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; - struct ifaddr *ifa; struct ifreq *ifr; int s, error = 0; @@ -1487,10 +1486,7 @@ otus_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) switch (cmd) { case SIOCSIFADDR: - ifa = (struct ifaddr *)data; ifp->if_flags |= IFF_UP; - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&ic->ic_ac, ifa); /* 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 277ac43519b..7a12cca9c36 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.132 2015/03/14 03:38:49 jsg Exp $ */ +/* $OpenBSD: if_ral.c,v 1.133 2015/10/25 12:11:56 mpi Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -1314,7 +1314,6 @@ ural_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct ural_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; - struct ifaddr *ifa; struct ifreq *ifr; int s, error = 0; @@ -1327,10 +1326,7 @@ ural_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) switch (cmd) { case SIOCSIFADDR: - ifa = (struct ifaddr *)data; ifp->if_flags |= IFF_UP; - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&ic->ic_ac, ifa); /* 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 e995b39ec01..16128ccb67c 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.27 2015/06/12 15:47:31 mpi Exp $ */ +/* $OpenBSD: if_rsu.c,v 1.28 2015/10/25 12:11:56 mpi Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini @@ -1664,7 +1664,6 @@ rsu_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct rsu_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; - struct ifaddr *ifa; struct ifreq *ifr; int s, error = 0; @@ -1677,10 +1676,7 @@ rsu_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) switch (cmd) { case SIOCSIFADDR: - ifa = (struct ifaddr *)data; ifp->if_flags |= IFF_UP; - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&ic->ic_ac, ifa); /* 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 02e07cf97d1..ef0466cd88c 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.111 2015/06/12 15:47:31 mpi Exp $ */ +/* $OpenBSD: if_rum.c,v 1.112 2015/10/25 12:11:56 mpi Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini @@ -1318,7 +1318,6 @@ rum_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct rum_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; - struct ifaddr *ifa; struct ifreq *ifr; int s, error = 0; @@ -1331,10 +1330,7 @@ rum_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) switch (cmd) { case SIOCSIFADDR: - ifa = (struct ifaddr *)data; ifp->if_flags |= IFF_UP; - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&ic->ic_ac, ifa); /* 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 b5f0736eeaa..639bc68d521 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.110 2015/08/28 15:37:04 reyk Exp $ */ +/* $OpenBSD: if_run.c,v 1.111 2015/10/25 12:11:56 mpi Exp $ */ /*- * Copyright (c) 2008-2010 Damien Bergamini @@ -2589,7 +2589,6 @@ run_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct run_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; - struct ifaddr *ifa; struct ifreq *ifr; int s, error = 0; @@ -2602,10 +2601,7 @@ run_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) switch (cmd) { case SIOCSIFADDR: - ifa = (struct ifaddr *)data; ifp->if_flags |= IFF_UP; - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&ic->ic_ac, ifa); /* 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 616f0756612..aff4fd8732f 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.20 2015/06/24 09:40:54 mpi Exp $ */ +/* $OpenBSD: if_smsc.c,v 1.21 2015/10/25 12:11:56 mpi Exp $ */ /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */ /*- * Copyright (c) 2012 @@ -861,7 +861,6 @@ smsc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct smsc_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; - struct ifaddr *ifa = (struct ifaddr *)data; int s, error = 0; s = splnet(); @@ -871,8 +870,6 @@ 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); - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&sc->sc_ac, ifa); break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index 9a4f54d978c..0a044f36bf2 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.69 2015/07/15 13:27:41 mpi Exp $ */ +/* $OpenBSD: if_uath.c,v 1.70 2015/10/25 12:11:56 mpi Exp $ */ /*- * Copyright (c) 2006 @@ -1552,7 +1552,6 @@ uath_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct uath_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; - struct ifaddr *ifa; struct ifreq *ifr; int s, error = 0; @@ -1560,10 +1559,7 @@ uath_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) switch (cmd) { case SIOCSIFADDR: - ifa = (struct ifaddr *)data; ifp->if_flags |= IFF_UP; - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&ic->ic_ac, ifa); /* 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 715b94b360a..e4ddd0ad63d 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.72 2015/06/24 09:40:54 mpi Exp $ */ +/* $OpenBSD: if_udav.c,v 1.73 2015/10/25 12:11:56 mpi 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 $ */ /* @@ -1133,7 +1133,6 @@ int udav_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct udav_softc *sc = ifp->if_softc; - struct ifaddr *ifa = (struct ifaddr *)data; struct ifreq *ifr = (struct ifreq *)data; int s, error = 0; @@ -1149,9 +1148,6 @@ udav_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_flags & IFF_RUNNING)) udav_init(ifp); - - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&sc->sc_ac, ifa); break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_ugl.c b/sys/dev/usb/if_ugl.c index 6e1692813f4..e7595880f4b 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.13 2015/06/24 09:40:54 mpi Exp $ */ +/* $OpenBSD: if_ugl.c,v 1.14 2015/10/25 12:11:56 mpi Exp $ */ /* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 2013 SASANO Takayoshi @@ -760,7 +760,6 @@ int ugl_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { struct ugl_softc *sc = ifp->if_softc; - struct ifaddr *ifa = (struct ifaddr *)data; int s, error = 0; if (usbd_is_dying(sc->sc_udev)) @@ -776,8 +775,6 @@ 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); - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&sc->sc_arpcom, ifa); break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c index 381ae287fb3..ebba641d27b 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.69 2015/05/02 10:44:29 jsg Exp $ */ +/* $OpenBSD: if_upgt.c,v 1.70 2015/10/25 12:11:56 mpi Exp $ */ /* * Copyright (c) 2007 Marcus Glocker @@ -1139,7 +1139,6 @@ upgt_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct upgt_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; - struct ifaddr *ifa; struct ifreq *ifr; int s, error = 0; uint8_t chan; @@ -1148,10 +1147,7 @@ upgt_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) switch (cmd) { case SIOCSIFADDR: - ifa = (struct ifaddr *)data; ifp->if_flags |= IFF_UP; - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&ic->ic_ac, ifa); /* FALLTHROUGH */ case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index e785409e7ed..a9a4cbe113c 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.75 2015/06/24 09:40:54 mpi Exp $ */ +/* $OpenBSD: if_url.c,v 1.76 2015/10/25 12:11:56 mpi Exp $ */ /* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */ /* * Copyright (c) 2001, 2002 @@ -1000,7 +1000,6 @@ int url_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct url_softc *sc = ifp->if_softc; - struct ifaddr *ifa = (struct ifaddr *)data; struct ifreq *ifr = (struct ifreq *)data; int s, error = 0; @@ -1016,8 +1015,6 @@ 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); - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&sc->sc_ac, ifa); break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_urndis.c b/sys/dev/usb/if_urndis.c index e059263cb44..73036bc8ff5 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.55 2015/06/24 09:40:54 mpi Exp $ */ +/* $OpenBSD: if_urndis.c,v 1.56 2015/10/25 12:11:56 mpi Exp $ */ /* * Copyright (c) 2010 Jonathan Armani @@ -968,7 +968,6 @@ int urndis_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { struct urndis_softc *sc = ifp->if_softc; - struct ifaddr *ifa = (struct ifaddr *)data; int s, error = 0; if (usbd_is_dying(sc->sc_udev)) @@ -981,8 +980,6 @@ 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); - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&sc->sc_arpcom, ifa); break; case SIOCSIFFLAGS: diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c index a99a73ee172..064acb822ac 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.54 2015/07/15 17:52:08 stsp Exp $ */ +/* $OpenBSD: if_urtw.c,v 1.55 2015/10/25 12:11:56 mpi Exp $ */ /*- * Copyright (c) 2009 Martynas Venckus @@ -2332,7 +2332,6 @@ urtw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct urtw_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; - struct ifaddr *ifa; struct ifreq *ifr; int s, error = 0; @@ -2345,10 +2344,7 @@ urtw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) switch (cmd) { case SIOCSIFADDR: - ifa = (struct ifaddr *)data; ifp->if_flags |= IFF_UP; - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&ic->ic_ac, ifa); /* 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 26acfce733d..6e28ee96b5e 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.52 2015/09/18 11:24:15 mpi Exp $ */ +/* $OpenBSD: if_urtwn.c,v 1.53 2015/10/25 12:11:56 mpi Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini @@ -2200,7 +2200,6 @@ urtwn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct urtwn_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; - struct ifaddr *ifa; struct ifreq *ifr; int s, error = 0; @@ -2213,10 +2212,7 @@ urtwn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) switch (cmd) { case SIOCSIFADDR: - ifa = (struct ifaddr *)data; ifp->if_flags |= IFF_UP; - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&ic->ic_ac, ifa); /* 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 5d0eb825537..9f3eb309ae3 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.108 2015/03/14 03:38:49 jsg Exp $ */ +/* $OpenBSD: if_zyd.c,v 1.109 2015/10/25 12:11:56 mpi Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini @@ -2301,7 +2301,6 @@ zyd_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct zyd_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; - struct ifaddr *ifa; struct ifreq *ifr; int s, error = 0; @@ -2309,10 +2308,7 @@ zyd_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) switch (cmd) { case SIOCSIFADDR: - ifa = (struct ifaddr *)data; ifp->if_flags |= IFF_UP; - if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&ic->ic_ac, ifa); /* FALLTHROUGH */ case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { -- 2.20.1