From b4d012a8c3c440d09f42eef3c7934d8070637386 Mon Sep 17 00:00:00 2001
From: mpi <mpi@openbsd.org>
Date: Sun, 25 Oct 2015 13:13:06 +0000
Subject: [PATCH] arp_ifinit() is no longer needed and almost dead.

---
 sys/dev/isa/if_ef_isapnp.c | 13 ++-----------
 sys/dev/isa/if_eg.c        | 14 ++------------
 sys/dev/isa/if_el.c        | 14 ++------------
 sys/dev/isa/if_ex.c        |  5 +----
 sys/dev/isa/if_ie.c        | 14 ++------------
 sys/dev/pcmcia/if_cnw.c    |  8 +-------
 sys/dev/pcmcia/if_malo.c   |  6 +-----
 sys/dev/pcmcia/if_xe.c     |  5 +----
 sys/dev/sbus/be.c          | 13 ++-----------
 sys/dev/sbus/qe.c          | 13 ++-----------
 10 files changed, 16 insertions(+), 89 deletions(-)

diff --git a/sys/dev/isa/if_ef_isapnp.c b/sys/dev/isa/if_ef_isapnp.c
index e546c7a7675..62caa7f6d3d 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.30 2015/07/08 07:21:50 mpi Exp $	*/
+/*	$OpenBSD: if_ef_isapnp.c,v 1.31 2015/10/25 13:13:06 mpi Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -335,7 +335,6 @@ efioctl(ifp, cmd, data)
 	caddr_t data;
 {
 	struct ef_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
@@ -344,15 +343,7 @@ efioctl(ifp, cmd, data)
 	switch (cmd) {
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
-		switch (ifa->ifa_addr->sa_family) {
-		case AF_INET:
-			efinit(sc);
-			arp_ifinit(&sc->sc_arpcom, ifa);
-			break;
-		default:
-			efinit(sc);
-			break;
-		}
+		efinit(sc);
 		break;
 	case SIOCSIFMEDIA:
 	case SIOCGIFMEDIA:
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index f4a348016dd..aef386a5cd0 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.39 2015/06/24 09:40:54 mpi Exp $	*/
+/*	$OpenBSD: if_eg.c,v 1.40 2015/10/25 13:13:06 mpi Exp $	*/
 /*	$NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $	*/
 
 /*
@@ -738,7 +738,6 @@ int
 egioctl(register struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct eg_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	int s, error = 0;
 
 	s = splnet();
@@ -746,16 +745,7 @@ egioctl(register 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:
-			eginit(sc);
-			arp_ifinit(&sc->sc_arpcom, ifa);
-			break;
-		default:
-			eginit(sc);
-			break;
-		}
+		eginit(sc);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 637368398f1..dfb9d66d780 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.27 2015/06/24 09:40:54 mpi Exp $       */
+/*    $OpenBSD: if_el.c,v 1.28 2015/10/25 13:13:06 mpi Exp $       */
 /*	$NetBSD: if_el.c,v 1.39 1996/05/12 23:52:32 mycroft Exp $	*/
 
 /*
@@ -574,7 +574,6 @@ elioctl(ifp, cmd, data)
 	caddr_t data;
 {
 	struct el_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	int s, error = 0;
 
 	s = splnet();
@@ -582,16 +581,7 @@ elioctl(ifp, cmd, data)
 	switch (cmd) {
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
-
-		switch (ifa->ifa_addr->sa_family) {
-		case AF_INET:
-			elinit(sc);
-			arp_ifinit(&sc->sc_arpcom, ifa);
-			break;
-		default:
-			elinit(sc);
-			break;
-		}
+		elinit(sc);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/isa/if_ex.c b/sys/dev/isa/if_ex.c
index 9ad0cec6bf0..7c2d29a43f2 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.40 2015/09/11 13:02:28 stsp Exp $	*/
+/*	$OpenBSD: if_ex.c,v 1.41 2015/10/25 13:13:06 mpi Exp $	*/
 /*
  * Copyright (c) 1997, Donald A. Schmidt
  * Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es)
@@ -731,7 +731,6 @@ int
 ex_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct ex_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *) data;
 	struct ifreq *ifr = (struct ifreq *) data;
 	int s, error = 0;
 
@@ -745,8 +744,6 @@ 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);
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			arp_ifinit(&sc->arpcom, ifa);
 		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 7457b0aeb58..5dbff9973f5 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.43 2015/06/24 09:40:54 mpi Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.44 2015/10/25 13:13:06 mpi Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $	*/
 
 /*-
@@ -2019,7 +2019,6 @@ ieioctl(ifp, cmd, data)
 	caddr_t data;
 {
 	struct ie_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	int s, error = 0;
 
 	s = splnet();
@@ -2027,16 +2026,7 @@ ieioctl(ifp, cmd, data)
 	switch (cmd) {
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
-
-		switch (ifa->ifa_addr->sa_family) {
-		case AF_INET:
-			ieinit(sc);
-			arp_ifinit(&sc->sc_arpcom, ifa);
-			break;
-		default:
-			ieinit(sc);
-			break;
-		}
+		ieinit(sc);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c
index a17751a6d3b..dd54d15c9ee 100644
--- a/sys/dev/pcmcia/if_cnw.c
+++ b/sys/dev/pcmcia/if_cnw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cnw.c,v 1.32 2015/07/08 07:21:50 mpi Exp $	*/
+/*	$OpenBSD: if_cnw.c,v 1.33 2015/10/25 13:13:06 mpi Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -749,7 +749,6 @@ cnw_ioctl(ifp, cmd, data)
 	caddr_t data;
 {
 	struct cnw_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	int s, error = 0;
 
 	s = splnet();
@@ -760,11 +759,6 @@ cnw_ioctl(ifp, cmd, data)
 		    (error = cnw_enable(sc)) != 0)
 			break;
 		ifp->if_flags |= IFF_UP;
-		switch (ifa->ifa_addr->sa_family) {
-		case AF_INET:
-			arp_ifinit(&sc->sc_arpcom, ifa);
-			break;
-		}
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c
index 06740aac977..929afefb4e4 100644
--- a/sys/dev/pcmcia/if_malo.c
+++ b/sys/dev/pcmcia/if_malo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_malo.c,v 1.85 2015/06/24 09:40:54 mpi Exp $ */
+/*      $OpenBSD: if_malo.c,v 1.86 2015/10/25 13:13:06 mpi Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -370,7 +370,6 @@ cmalo_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ieee80211_nodereq_all *na;
 	struct ieee80211_nodereq *nr;
-	struct ifaddr *ifa;
 	struct ifreq *ifr;
 	int i, j, s, error = 0;
 
@@ -389,10 +388,7 @@ cmalo_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/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c
index c9614908a06..96962d764c3 100644
--- a/sys/dev/pcmcia/if_xe.c
+++ b/sys/dev/pcmcia/if_xe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xe.c,v 1.52 2015/07/08 07:21:50 mpi Exp $	*/
+/*	$OpenBSD: if_xe.c,v 1.53 2015/10/25 13:13:06 mpi Exp $	*/
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist, Brandon Creighton, Job de Haas
@@ -1160,7 +1160,6 @@ xe_ioctl(ifp, command, data)
 	caddr_t data;
 {
 	struct xe_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
@@ -1170,8 +1169,6 @@ xe_ioctl(ifp, command, data)
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
 		xe_init(sc);
-		if (ifa->ifa_addr->sa_family == AF_INET)
-			arp_ifinit(&sc->sc_arpcom, ifa);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c
index c168a44eefa..ee4cbff690e 100644
--- a/sys/dev/sbus/be.c
+++ b/sys/dev/sbus/be.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: be.c,v 1.34 2015/09/12 10:15:10 miod Exp $	*/
+/*	$OpenBSD: be.c,v 1.35 2015/10/25 13:13:06 mpi Exp $	*/
 /*	$NetBSD: be.c,v 1.26 2001/03/20 15:39:20 pk Exp $	*/
 
 /*-
@@ -912,7 +912,6 @@ int
 beioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct be_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
@@ -921,15 +920,7 @@ beioctl(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:
-			beinit(sc);
-			arp_ifinit(&sc->sc_arpcom, ifa);
-			break;
-		default:
-			beinit(sc);
-			break;
-		}
+		beinit(sc);
 		break;
 
 	case SIOCSIFFLAGS:
diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c
index 45426eb421e..e029eda1c55 100644
--- a/sys/dev/sbus/qe.c
+++ b/sys/dev/sbus/qe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qe.c,v 1.31 2015/09/11 13:02:28 stsp Exp $	*/
+/*	$OpenBSD: qe.c,v 1.32 2015/10/25 13:13:06 mpi Exp $	*/
 /*	$NetBSD: qe.c,v 1.16 2001/03/30 17:30:18 christos Exp $	*/
 
 /*-
@@ -884,7 +884,6 @@ qeioctl(ifp, cmd, data)
 	caddr_t data;
 {
 	struct qe_softc *sc = ifp->if_softc;
-	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 
@@ -893,15 +892,7 @@ qeioctl(ifp, cmd, data)
 	switch (cmd) {
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
-		switch (ifa->ifa_addr->sa_family) {
-		case AF_INET:
-			qeinit(sc);
-			arp_ifinit(&sc->sc_arpcom, ifa);
-			break;
-		default:
-			qeinit(sc);
-			break;
-		}
+		qeinit(sc);
 		break;
 
 	case SIOCSIFFLAGS:
-- 
2.20.1