From d2d9c74c754c1bdd0c0d8be50c7b5a7636cd2640 Mon Sep 17 00:00:00 2001
From: mpi <mpi@openbsd.org>
Date: Sun, 25 Oct 2015 12:48:46 +0000
Subject: [PATCH] arp_ifinit() is no longer needed.

---
 sys/dev/ic/acx.c       |  6 +-----
 sys/dev/ic/aic6915.c   |  5 +----
 sys/dev/ic/an.c        | 13 ++-----------
 sys/dev/ic/ath.c       |  6 +-----
 sys/dev/ic/athn.c      |  6 +-----
 sys/dev/ic/atw.c       |  7 +------
 sys/dev/ic/bwi.c       |  6 +-----
 sys/dev/ic/dc.c        |  5 +----
 sys/dev/ic/dp8390.c    |  5 +----
 sys/dev/ic/elink3.c    |  5 +----
 sys/dev/ic/fxp.c       |  5 +----
 sys/dev/ic/gem.c       |  5 +----
 sys/dev/ic/hme.c       |  5 +----
 sys/dev/ic/i82596.c    | 14 ++------------
 sys/dev/ic/if_wi.c     | 13 ++-----------
 sys/dev/ic/lance.c     |  5 +----
 sys/dev/ic/lemac.c     | 11 +----------
 sys/dev/ic/malo.c      |  6 +-----
 sys/dev/ic/mtd8xx.c    |  8 +-------
 sys/dev/ic/pgt.c       |  6 +-----
 sys/dev/ic/re.c        |  5 +----
 sys/dev/ic/rt2560.c    |  6 +-----
 sys/dev/ic/rt2661.c    |  6 +-----
 sys/dev/ic/rt2860.c    |  6 +-----
 sys/dev/ic/rtl81x9.c   |  5 +----
 sys/dev/ic/rtw.c       |  7 +------
 sys/dev/ic/smc83c170.c | 14 ++------------
 sys/dev/ic/smc91cxx.c  | 13 ++-----------
 sys/dev/ic/ti.c        |  5 +----
 sys/dev/ic/xl.c        |  5 +----
 30 files changed, 35 insertions(+), 179 deletions(-)

diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index 7e8a78d5626..c932aa64574 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx.c,v 1.112 2015/09/06 04:10:34 deraadt Exp $ */
+/*	$OpenBSD: acx.c,v 1.113 2015/10/25 12:48:46 mpi Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -839,7 +839,6 @@ acx_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct acx_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifaddr *ifa;
 	struct ifreq *ifr;
 	int s, error = 0;
 	uint8_t chan;
@@ -848,10 +847,7 @@ acx_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/ic/aic6915.c b/sys/dev/ic/aic6915.c
index 4bdfec419fc..fd90f712c38 100644
--- a/sys/dev/ic/aic6915.c
+++ b/sys/dev/ic/aic6915.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6915.c,v 1.17 2015/06/24 09:40:54 mpi Exp $	*/
+/*	$OpenBSD: aic6915.c,v 1.18 2015/10/25 12:48:46 mpi Exp $	*/
 /*	$NetBSD: aic6915.c,v 1.15 2005/12/24 20:27:29 perry Exp $	*/
 
 /*-
@@ -508,7 +508,6 @@ int
 sf_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct sf_softc *sc = (struct sf_softc *)ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *) data;
 	int s, error = 0;
 
@@ -519,8 +518,6 @@ 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);
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			arp_ifinit(&sc->sc_arpcom, ifa);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index 077cf7afab4..1d29bfed8db 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: an.c,v 1.65 2015/06/21 21:22:27 krw Exp $	*/
+/*	$OpenBSD: an.c,v 1.66 2015/10/25 12:48:46 mpi Exp $	*/
 /*	$NetBSD: an.c,v 1.34 2005/06/20 02:49:18 atatat Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -874,7 +874,6 @@ int
 an_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct an_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	int s, error = 0;
 
 	if ((sc->sc_dev.dv_flags & DVF_ACTIVE) == 0)
@@ -885,15 +884,7 @@ an_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	switch(command) {
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
-		switch (ifa->ifa_addr->sa_family) {
-		case AF_INET:
-			error = an_init(ifp);
-			arp_ifinit(&sc->sc_ic.ic_ac, ifa);
-			break;
-		default:
-			error = an_init(ifp);
-			break;
-		}
+		error = an_init(ifp);
 		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 0fbac5b1a1f..6fa549bcb3b 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ath.c,v 1.105 2015/03/14 03:38:47 jsg Exp $  */
+/*      $OpenBSD: ath.c,v 1.106 2015/10/25 12:48:46 mpi Exp $  */
 /*	$NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $	*/
 
 /*-
@@ -977,16 +977,12 @@ ath_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	struct ath_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifreq *ifr = (struct ifreq *)data;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	int error = 0, s;
 
 	s = splnet();
 	switch (cmd) {
 	case SIOCSIFADDR:
 		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/ic/athn.c b/sys/dev/ic/athn.c
index dede2eb9653..55f9d4df062 100644
--- a/sys/dev/ic/athn.c
+++ b/sys/dev/ic/athn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: athn.c,v 1.86 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: athn.c,v 1.87 2015/10/25 12:48:46 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -2657,7 +2657,6 @@ athn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct athn_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifaddr *ifa;
 	struct ifreq *ifr;
 	int s, error = 0;
 
@@ -2665,10 +2664,7 @@ athn_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/ic/atw.c b/sys/dev/ic/atw.c
index 95a77c6b4c2..1e42fd7fbf8 100644
--- a/sys/dev/ic/atw.c
+++ b/sys/dev/ic/atw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atw.c,v 1.88 2015/09/06 04:10:58 deraadt Exp $	*/
+/*	$OpenBSD: atw.c,v 1.89 2015/10/25 12:48:46 mpi Exp $	*/
 /*	$NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*-
@@ -4004,9 +4004,7 @@ int
 atw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct atw_softc *sc = ifp->if_softc;
-	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifreq *ifr = (struct ifreq *)data;
-   	struct ifaddr *ifa = (struct ifaddr *)data;
 	int s, error = 0;
 
 	/* XXX monkey see, monkey do. comes from wi_ioctl. */
@@ -4018,9 +4016,6 @@ atw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	switch (cmd) {
         case SIOCSIFADDR:
                 ifp->if_flags |= IFF_UP;
-                if (ifa->ifa_addr->sa_family == AF_INET) {
-                        arp_ifinit(&ic->ic_ac, ifa);
-                }
 		/* FALLTHROUGH */
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 5702da1f3bb..214644f9ad4 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwi.c,v 1.117 2015/08/29 20:55:34 deraadt Exp $	*/
+/*	$OpenBSD: bwi.c,v 1.118 2015/10/25 12:48:46 mpi Exp $	*/
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -7112,7 +7112,6 @@ bwi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct bwi_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifaddr *ifa;
 	struct ifreq *ifr;
 	int s, error = 0;
 	uint8_t chan;
@@ -7121,10 +7120,7 @@ bwi_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/ic/dc.c b/sys/dev/ic/dc.c
index 481d9690a43..6a4a903cfe5 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dc.c,v 1.144 2015/09/12 09:56:36 miod Exp $	*/
+/*	$OpenBSD: dc.c,v 1.145 2015/10/25 12:48:46 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -2914,7 +2914,6 @@ dc_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct dc_softc		*sc = ifp->if_softc;
 	struct ifreq		*ifr = (struct ifreq *) data;
-	struct ifaddr		*ifa = (struct ifaddr *)data;
 	int			s, error = 0;
 
 	s = splnet();
@@ -2924,8 +2923,6 @@ 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);
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			arp_ifinit(&sc->sc_arpcom, ifa);
 		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index fb1f3d28c51..28047bc461d 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dp8390.c,v 1.55 2015/06/24 09:40:54 mpi Exp $	*/
+/*	$OpenBSD: dp8390.c,v 1.56 2015/10/25 12:48:46 mpi Exp $	*/
 /*	$NetBSD: dp8390.c,v 1.13 1998/07/05 06:49:11 jonathan Exp $	*/
 
 /*
@@ -814,7 +814,6 @@ int
 dp8390_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct dp8390_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *) data;
 	struct ifreq *ifr = (struct ifreq *) data;
 	int s, error = 0;
 
@@ -827,8 +826,6 @@ 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);
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			arp_ifinit(&sc->sc_arpcom, ifa);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index f5f1e518592..328a60e8495 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elink3.c,v 1.87 2015/09/11 13:02:28 stsp Exp $	*/
+/*	$OpenBSD: elink3.c,v 1.88 2015/10/25 12:48:46 mpi Exp $	*/
 /*	$NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $	*/
 
 /*
@@ -1419,7 +1419,6 @@ int
 epioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct ep_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
@@ -1430,8 +1429,6 @@ epioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ifp->if_flags |= IFF_UP;
 		if (!(ifp->if_flags & IFF_RUNNING))
 			epinit(sc);
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			arp_ifinit(&sc->sc_arpcom, ifa);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c
index 094b898fff0..78388fc26d7 100644
--- a/sys/dev/ic/fxp.c
+++ b/sys/dev/ic/fxp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fxp.c,v 1.122 2015/08/29 20:55:34 deraadt Exp $	*/
+/*	$OpenBSD: fxp.c,v 1.123 2015/10/25 12:48:46 mpi Exp $	*/
 /*	$NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $	*/
 
 /*
@@ -1632,7 +1632,6 @@ fxp_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct fxp_softc *sc = ifp->if_softc;
 	struct ifreq *ifr = (struct ifreq *)data;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	int s, error = 0;
 
 	s = splnet();
@@ -1642,8 +1641,6 @@ 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);
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			arp_ifinit(&sc->sc_arpcom, ifa);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index 4044432b762..62cc2070bce 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gem.c,v 1.113 2015/09/11 13:02:28 stsp Exp $	*/
+/*	$OpenBSD: gem.c,v 1.114 2015/10/25 12:48:46 mpi Exp $	*/
 /*	$NetBSD: gem.c,v 1.1 2001/09/16 00:11:43 eeh Exp $ */
 
 /*
@@ -1490,7 +1490,6 @@ int
 gem_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct gem_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
@@ -1501,8 +1500,6 @@ 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);
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			arp_ifinit(&sc->sc_arpcom, ifa);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c
index b9d915c1907..41da924046a 100644
--- a/sys/dev/ic/hme.c
+++ b/sys/dev/ic/hme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hme.c,v 1.74 2015/09/11 13:02:28 stsp Exp $	*/
+/*	$OpenBSD: hme.c,v 1.75 2015/10/25 12:48:46 mpi Exp $	*/
 /*	$NetBSD: hme.c,v 1.21 2001/07/07 15:59:37 thorpej Exp $	*/
 
 /*-
@@ -1152,7 +1152,6 @@ int
 hme_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct hme_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
@@ -1163,8 +1162,6 @@ 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);
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			arp_ifinit(&sc->sc_arpcom, ifa);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c
index 3d0f1e4fff4..7bb69f23235 100644
--- a/sys/dev/ic/i82596.c
+++ b/sys/dev/ic/i82596.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82596.c,v 1.44 2015/09/18 09:54:08 miod Exp $	*/
+/*	$OpenBSD: i82596.c,v 1.45 2015/10/25 12:48:46 mpi Exp $	*/
 /*	$NetBSD: i82586.c,v 1.18 1998/08/15 04:42:42 mycroft Exp $	*/
 
 /*-
@@ -1852,7 +1852,6 @@ i82596_ioctl(ifp, cmd, data)
 	caddr_t data;
 {
 	struct ie_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
@@ -1861,16 +1860,7 @@ i82596_ioctl(ifp, cmd, data)
 	switch(cmd) {
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
-
-		switch(ifa->ifa_addr->sa_family) {
-		case AF_INET:
-			i82596_init(sc);
-			arp_ifinit(&sc->sc_arpcom, ifa);
-			break;
-		default:
-			i82596_init(sc);
-			break;
-		}
+		i82596_init(sc);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index 2b8bc35684c..7502b274562 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.163 2015/09/11 13:02:28 stsp Exp $	*/
+/*	$OpenBSD: if_wi.c,v 1.164 2015/10/25 12:48:46 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -1526,7 +1526,6 @@ wi_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	struct wi_softc		*sc = ifp->if_softc;
 	struct ifreq		*ifr = (struct ifreq *)data;
 	struct proc		*p = curproc;
-	struct ifaddr		*ifa = (struct ifaddr *)data;
 	struct wi_scan_res	*res;
 	struct wi_scan_p2_hdr	*p2;
 	struct wi_req		*wreq = NULL;
@@ -1560,15 +1559,7 @@ wi_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	switch(command) {
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
-		switch (ifa->ifa_addr->sa_family) {
-		case AF_INET:
-			wi_init(sc);
-			arp_ifinit(&sc->sc_ic.ic_ac, ifa);
-			break;
-		default:
-			wi_init(sc);
-			break;
-		}
+		wi_init(sc);
 		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
diff --git a/sys/dev/ic/lance.c b/sys/dev/ic/lance.c
index e8288da9074..daeb185354d 100644
--- a/sys/dev/ic/lance.c
+++ b/sys/dev/ic/lance.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lance.c,v 1.8 2015/07/08 07:21:50 mpi Exp $	*/
+/*	$OpenBSD: lance.c,v 1.9 2015/10/25 12:48:46 mpi Exp $	*/
 /*	$NetBSD: lance.c,v 1.46 2012/02/02 19:43:03 tls Exp $	*/
 
 /*-
@@ -500,7 +500,6 @@ int
 lance_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct lance_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
@@ -511,8 +510,6 @@ 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);
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			arp_ifinit(&sc->sc_arpcom, ifa);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/lemac.c b/sys/dev/ic/lemac.c
index c00af6637ab..9b9a8bdcd18 100644
--- a/sys/dev/ic/lemac.c
+++ b/sys/dev/ic/lemac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lemac.c,v 1.21 2015/09/11 13:02:28 stsp Exp $ */
+/* $OpenBSD: lemac.c,v 1.22 2015/10/25 12:48:46 mpi Exp $ */
 /* $NetBSD: lemac.c,v 1.20 2001/06/13 10:46:02 wiz Exp $ */
 
 /*-
@@ -771,7 +771,6 @@ int
 lemac_ifioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct lemac_softc *const sc = LEMAC_IFP_TO_SOFTC(ifp);
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
@@ -781,14 +780,6 @@ lemac_ifioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
 		lemac_init(sc);
-		switch (ifa->ifa_addr->sa_family) {
-		case AF_INET:
-			arp_ifinit(&sc->sc_arpcom, ifa);
-			break;
-
-		default:
-			break;
-		}
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index 2845fb335a3..2ab80aba5fe 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malo.c,v 1.107 2015/09/09 18:23:55 deraadt Exp $ */
+/*	$OpenBSD: malo.c,v 1.108 2015/10/25 12:48:46 mpi Exp $ */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -935,7 +935,6 @@ malo_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct malo_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifaddr *ifa;
 	struct ifreq *ifr;
 	int s, error = 0;
 	uint8_t chan;
@@ -944,10 +943,7 @@ malo_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/ic/mtd8xx.c b/sys/dev/ic/mtd8xx.c
index 085e0d37217..eef31bf3df1 100644
--- a/sys/dev/ic/mtd8xx.c
+++ b/sys/dev/ic/mtd8xx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtd8xx.c,v 1.27 2015/06/24 09:40:54 mpi Exp $	*/
+/*	$OpenBSD: mtd8xx.c,v 1.28 2015/10/25 12:48:46 mpi Exp $	*/
 
 /*
  * Copyright (c) 2003 Oleg Safiullin <form@pdp11.org.ru>
@@ -572,7 +572,6 @@ static int
 mtd_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct mtd_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
@@ -582,11 +581,6 @@ mtd_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
 		mtd_init(ifp);
-		switch (ifa->ifa_addr->sa_family) {
-		case AF_INET:
-			arp_ifinit(&sc->sc_arpcom, ifa);
-			break;
-		}
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index c4608587705..ef6c8174a31 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pgt.c,v 1.78 2015/05/21 09:36:20 mpi Exp $  */
+/*	$OpenBSD: pgt.c,v 1.79 2015/10/25 12:48:46 mpi Exp $  */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -2231,7 +2231,6 @@ int
 pgt_ioctl(struct ifnet *ifp, u_long cmd, caddr_t req)
 {
 	struct pgt_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa;
 	struct ifreq *ifr;
 	struct wi_req *wreq;
 	struct ieee80211_nodereq_all *na;
@@ -2348,10 +2347,7 @@ pgt_ioctl(struct ifnet *ifp, u_long cmd, caddr_t req)
 		break;
 	}
 	case SIOCSIFADDR:
-		ifa = (struct ifaddr *)req;
 		ifp->if_flags |= IFF_UP;
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			 arp_ifinit(&sc->sc_ic.ic_ac, ifa);
 		/* FALLTHROUGH */
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index f9579eea026..d0203b58bb4 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: re.c,v 1.180 2015/09/04 07:05:44 jsg Exp $	*/
+/*	$OpenBSD: re.c,v 1.181 2015/10/25 12:48:46 mpi Exp $	*/
 /*	$FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $	*/
 /*
  * Copyright (c) 1997, 1998-2003
@@ -2066,7 +2066,6 @@ re_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct rl_softc	*sc = ifp->if_softc;
 	struct ifreq	*ifr = (struct ifreq *) data;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	int		s, error = 0;
 
 	s = splnet();
@@ -2076,8 +2075,6 @@ 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);
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			arp_ifinit(&sc->sc_arpcom, ifa);
 		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index 4d1864232ed..0cb12360c09 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2560.c,v 1.72 2015/09/09 19:26:05 deraadt Exp $  */
+/*	$OpenBSD: rt2560.c,v 1.73 2015/10/25 12:48:46 mpi Exp $  */
 
 /*-
  * Copyright (c) 2005, 2006
@@ -2006,7 +2006,6 @@ rt2560_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct rt2560_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifaddr *ifa;
 	struct ifreq *ifr;
 	int s, error = 0;
 
@@ -2014,10 +2013,7 @@ rt2560_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/ic/rt2661.c b/sys/dev/ic/rt2661.c
index e682a5a6bf4..6c121104cf0 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2661.c,v 1.82 2015/09/09 19:26:05 deraadt Exp $	*/
+/*	$OpenBSD: rt2661.c,v 1.83 2015/10/25 12:48:46 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -2011,7 +2011,6 @@ rt2661_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct rt2661_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifaddr *ifa;
 	struct ifreq *ifr;
 	int s, error = 0;
 
@@ -2019,10 +2018,7 @@ rt2661_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/ic/rt2860.c b/sys/dev/ic/rt2860.c
index e4d39ff0584..a1e3d887474 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2860.c,v 1.81 2015/08/29 20:55:34 deraadt Exp $	*/
+/*	$OpenBSD: rt2860.c,v 1.82 2015/10/25 12:48:46 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1815,7 +1815,6 @@ rt2860_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct rt2860_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifaddr *ifa;
 	struct ifreq *ifr;
 	int s, error = 0;
 
@@ -1823,10 +1822,7 @@ rt2860_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/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index 3a9d0161a50..2ac5982bad9 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtl81x9.c,v 1.91 2015/06/24 09:40:54 mpi Exp $ */
+/*	$OpenBSD: rtl81x9.c,v 1.92 2015/10/25 12:48:46 mpi Exp $ */
 
 /*
  * Copyright (c) 1997, 1998
@@ -1007,7 +1007,6 @@ rl_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct rl_softc	*sc = ifp->if_softc;
 	struct ifreq	*ifr = (struct ifreq *) data;
-	struct ifaddr	*ifa = (struct ifaddr *) data;
 	int		s, error = 0;
 
 	s = splnet();
@@ -1017,8 +1016,6 @@ 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);
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			arp_ifinit(&sc->sc_arpcom, ifa);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index 3e0155781ed..9592b45943d 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtw.c,v 1.90 2015/02/10 23:25:46 mpi Exp $	*/
+/*	$OpenBSD: rtw.c,v 1.91 2015/10/25 12:48:46 mpi Exp $	*/
 /*	$NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */
 
 /*-
@@ -2603,8 +2603,6 @@ int
 rtw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct rtw_softc *sc = ifp->if_softc;
-	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int rc = 0, s;
 
@@ -2613,9 +2611,6 @@ rtw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	switch (cmd) {
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
-		if (ifa->ifa_addr->sa_family == AF_INET) {
-			arp_ifinit(&ic->ic_ac, ifa);
-		}
 		/* FALLTHROUGH */
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/smc83c170.c b/sys/dev/ic/smc83c170.c
index bbad3733a72..c5cf4458a3d 100644
--- a/sys/dev/ic/smc83c170.c
+++ b/sys/dev/ic/smc83c170.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smc83c170.c,v 1.22 2015/09/11 13:02:28 stsp Exp $	*/
+/*	$OpenBSD: smc83c170.c,v 1.23 2015/10/25 12:48:46 mpi Exp $	*/
 /*	$NetBSD: smc83c170.c,v 1.59 2005/02/27 00:27:02 perry Exp $	*/
 
 /*-
@@ -522,7 +522,6 @@ int
 epic_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct epic_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
@@ -531,16 +530,7 @@ epic_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	switch (cmd) {
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
-
-		switch (ifa->ifa_addr->sa_family) {
-		case AF_INET:
-			epic_init(ifp);
-			arp_ifinit(&sc->sc_arpcom, ifa);
-			break;
-		default:
-			epic_init(ifp);
-			break;
-		}
+		epic_init(ifp);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c
index 9fcebee9026..22f13c0b086 100644
--- a/sys/dev/ic/smc91cxx.c
+++ b/sys/dev/ic/smc91cxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smc91cxx.c,v 1.41 2015/09/11 13:02:28 stsp Exp $	*/
+/*	$OpenBSD: smc91cxx.c,v 1.42 2015/10/25 12:48:46 mpi Exp $	*/
 /*	$NetBSD: smc91cxx.c,v 1.11 1998/08/08 23:51:41 mycroft Exp $	*/
 
 /*-
@@ -1022,7 +1022,6 @@ smc91cxx_ioctl(ifp, cmd, data)
 	caddr_t data;
 {
 	struct smc91cxx_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
@@ -1033,15 +1032,7 @@ smc91cxx_ioctl(ifp, cmd, data)
 		if ((error = smc91cxx_enable(sc)) != 0)
 			break;
 		ifp->if_flags |= IFF_UP;
-		switch (ifa->ifa_addr->sa_family) {
-		case AF_INET:
-			smc91cxx_init(sc);
-			arp_ifinit(&sc->sc_arpcom, ifa);
-			break;
-		default:
-			smc91cxx_init(sc);
-			break;
-		}
+		smc91cxx_init(sc);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/ti.c b/sys/dev/ic/ti.c
index 89485b9f0d2..2178e21652e 100644
--- a/sys/dev/ic/ti.c
+++ b/sys/dev/ic/ti.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ti.c,v 1.17 2015/09/09 18:24:26 deraadt Exp $	*/
+/*	$OpenBSD: ti.c,v 1.18 2015/10/25 12:48:46 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -2224,7 +2224,6 @@ int
 ti_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct ti_softc		*sc = ifp->if_softc;
-	struct ifaddr		*ifa = (struct ifaddr *)data;
 	struct ifreq		*ifr = (struct ifreq *)data;
 	int			s, error = 0;
 
@@ -2235,8 +2234,6 @@ 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);
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			arp_ifinit(&sc->arpcom, ifa);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c
index c36fcd6717c..640f01f782a 100644
--- a/sys/dev/ic/xl.c
+++ b/sys/dev/ic/xl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xl.c,v 1.126 2015/09/11 13:02:28 stsp Exp $	*/
+/*	$OpenBSD: xl.c,v 1.127 2015/10/25 12:48:46 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -2162,7 +2162,6 @@ xl_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct xl_softc *sc = ifp->if_softc;
 	struct ifreq *ifr = (struct ifreq *)data;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	int s, error = 0;
 	struct mii_data *mii = NULL;
 
@@ -2173,8 +2172,6 @@ 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);
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			arp_ifinit(&sc->sc_arpcom, ifa);
 		break;
 
 	case SIOCSIFFLAGS:
-- 
2.20.1