Move common code to add/remove multicast filters to ieee80211_ioctl(9).

ok jsg@, stsp@

23 files changed, 31 insertions, 274 deletions

diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index 9d29f577421..a1ca62ea1a4 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx.c,v 1.120 2017/01/22 10:17:37 dlg Exp $ */
+/*	$OpenBSD: acx.c,v 1.121 2017/10/26 15:00:28 mpi Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -837,7 +837,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 ifreq *ifr;
 	int s, error = 0;
 	uint8_t chan;
 
@@ -856,16 +855,6 @@ acx_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 				error = acx_stop(sc);
 		}
 		break;
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-
-		if (error == ENETRESET)
-			error = 0;
-		break;
 	case SIOCS80211CHANNEL:
 		/* allow fast channel switching in monitor mode */
 		error = ieee80211_ioctl(ifp, cmd, data);
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index ee04f178247..58417ce6f7d 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwi.c,v 1.126 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: bwi.c,v 1.127 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -7107,7 +7107,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 ifreq *ifr;
 	int s, error = 0;
 	uint8_t chan;
 
@@ -7126,16 +7125,6 @@ bwi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 				bwi_stop(sc, 1);
 		}
 		break;
-        case SIOCADDMULTI:
-        case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-
-		if (error == ENETRESET)
-			error = 0;
-		break;
 	case SIOCS80211CHANNEL:
 		/* allow fast channel switching in monitor mode */
 		error = ieee80211_ioctl(ifp, cmd, data);
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index 2cb532c47b6..552d9303b9d 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malo.c,v 1.115 2017/09/08 05:36:52 deraadt Exp $ */
+/*	$OpenBSD: malo.c,v 1.116 2017/10/26 15:00:28 mpi Exp $ */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -933,7 +933,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 ifreq *ifr;
 	int s, error = 0;
 	uint8_t chan;
 
@@ -952,16 +951,6 @@ malo_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 				malo_stop(sc);
 		}
 		break;
-        case SIOCADDMULTI:
-        case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-
-		if (error == ENETRESET)
-			error = 0;
-		break;
 	case SIOCS80211CHANNEL:
 		/* allow fast channel switching in monitor mode */
 		error = ieee80211_ioctl(ifp, cmd, data);
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index fa43404027e..45a85503221 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pgt.c,v 1.89 2017/01/22 10:17:38 dlg Exp $  */
+/*	$OpenBSD: pgt.c,v 1.90 2017/10/26 15:00:28 mpi Exp $  */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -2362,15 +2362,6 @@ pgt_ioctl(struct ifnet *ifp, u_long cmd, caddr_t req)
 			}
 		}
 		break;
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-
-		if (error == ENETRESET)
-			error = 0;
-		break;
 	case SIOCSIFMTU:
 		if (ifr->ifr_mtu > PGT_FRAG_SIZE) {
 			error = EINVAL;
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index d951ec9b8ee..c8d85564272 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2560.c,v 1.83 2017/07/03 09:21:09 kevlo Exp $  */
+/*	$OpenBSD: rt2560.c,v 1.84 2017/10/26 15:00:28 mpi Exp $  */
 
 /*-
  * Copyright (c) 2005, 2006
@@ -2011,7 +2011,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 ifreq *ifr;
 	int s, error = 0;
 
 	s = splnet();
@@ -2032,17 +2031,6 @@ rt2560_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		}
 		break;
 
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-
-		if (error == ENETRESET)
-			error = 0;
-		break;
-
 	case SIOCS80211CHANNEL:
 		/*
 		 * This allows for fast channel switching in monitor mode
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index 7350385b935..591115f692d 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2661.c,v 1.93 2017/08/12 14:09:46 stsp Exp $	*/
+/*	$OpenBSD: rt2661.c,v 1.94 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -2006,7 +2006,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 ifreq *ifr;
 	int s, error = 0;
 
 	s = splnet();
@@ -2027,17 +2026,6 @@ rt2661_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		}
 		break;
 
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-
-		if (error == ENETRESET)
-			error = 0;
-		break;
-
 	case SIOCS80211CHANNEL:
 		/*
 		 * This allows for fast channel switching in monitor mode
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index 1da76f7476a..3a34c866913 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2860.c,v 1.94 2017/07/03 09:21:09 kevlo Exp $	*/
+/*	$OpenBSD: rt2860.c,v 1.95 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1778,7 +1778,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 ifreq *ifr;
 	int s, error = 0;
 
 	s = splnet();
@@ -1797,17 +1796,6 @@ rt2860_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		}
 		break;
 
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-
-		if (error == ENETRESET)
-			error = 0;
-		break;
-
 	case SIOCS80211CHANNEL:
 		/*
 		 * This allows for fast channel switching in monitor mode
diff --git a/sys/dev/ic/rtwn.c b/sys/dev/ic/rtwn.c
index adcd9ecef83..ed034cae8cd 100644
--- a/sys/dev/ic/rtwn.c
+++ b/sys/dev/ic/rtwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtwn.c,v 1.35 2017/09/23 13:57:41 stsp Exp $	*/
+/*	$OpenBSD: rtwn.c,v 1.36 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1434,7 +1434,6 @@ rtwn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct rtwn_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifreq *ifr;
 	int s, error = 0;
 
 	s = splnet();
@@ -1463,15 +1462,6 @@ rtwn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 				rtwn_stop(ifp);
 		}
 		break;
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-		if (error == ENETRESET)
-			error = 0;
-		break;
 	case SIOCS80211CHANNEL:
 		error = ieee80211_ioctl(ifp, cmd, data);
 		if (error == ENETRESET &&
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 2ff08aef73b..57532466efd 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ipw.c,v 1.120 2017/03/08 12:02:41 mpi Exp $	*/
+/*	$OpenBSD: if_ipw.c,v 1.121 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2004-2008
@@ -1348,8 +1348,6 @@ int
 ipw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct ipw_softc *sc = ifp->if_softc;
-	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifreq *ifr;
 	int s, error = 0;
 
 	error = rw_enter(&sc->sc_rwlock, RW_WRITE | RW_INTR);
@@ -1371,17 +1369,6 @@ ipw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		}
 		break;
 
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-
-		if (error == ENETRESET)
-			error = 0;
-		break;
-
 	case SIOCG80211TXPOWER:
 		/*
 		 * If the hardware radio transmitter switch is off, report a
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index 2377853bc80..f60f9113333 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwi.c,v 1.136 2017/03/29 16:42:25 stsp Exp $	*/
+/*	$OpenBSD: if_iwi.c,v 1.137 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2004-2008
@@ -1445,8 +1445,6 @@ int
 iwi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct iwi_softc *sc = ifp->if_softc;
-	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifreq *ifr;
 	int s, error = 0;
 
 	error = rw_enter(&sc->sc_rwlock, RW_WRITE | RW_INTR);
@@ -1468,17 +1466,6 @@ iwi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		}
 		break;
 
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-
-		if (error == ENETRESET)
-			error = 0;
-		break;
-
 	case SIOCG80211TXPOWER:
 		/*
 		 * If the hardware radio transmitter switch is off, report a
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c
index 6c5ea38f322..cf1749b1010 100644
--- a/sys/dev/pci/if_iwm.c
+++ b/sys/dev/pci/if_iwm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwm.c,v 1.216 2017/10/22 09:55:02 stsp Exp $	*/
+/*	$OpenBSD: if_iwm.c,v 1.217 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -6650,8 +6650,6 @@ int
 iwm_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct iwm_softc *sc = ifp->if_softc;
-	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifreq *ifr;
 	int s, err = 0, generation = sc->sc_generation;
 
 	/*
@@ -6682,16 +6680,6 @@ iwm_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		}
 		break;
 
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		err = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-		if (err == ENETRESET)
-			err = 0;
-		break;
-
 	default:
 		err = ieee80211_ioctl(ifp, cmd, data);
 	}
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index 0089dbfd842..a92be2287ac 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwn.c,v 1.193 2017/09/28 16:17:30 stsp Exp $	*/
+/*	$OpenBSD: if_iwn.c,v 1.194 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -3281,7 +3281,6 @@ iwn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct iwn_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifreq *ifr;
 	int s, error = 0;
 
 	error = rw_enter(&sc->sc_rwlock, RW_WRITE | RW_INTR);
@@ -3303,17 +3302,6 @@ iwn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		}
 		break;
 
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-
-		if (error == ENETRESET)
-			error = 0;
-		break;
-
 	case SIOCS80211POWER:
 		error = ieee80211_ioctl(ifp, cmd, data);
 		if (error != ENETRESET)
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index 5106d75a6b2..29e468e9549 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wpi.c,v 1.140 2017/04/08 02:57:25 deraadt Exp $	*/
+/*	$OpenBSD: if_wpi.c,v 1.141 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006-2008
@@ -1968,7 +1968,6 @@ wpi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct wpi_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
-	struct ifreq *ifr;
 	int s, error = 0;
 
 	error = rw_enter(&sc->sc_rwlock, RW_WRITE | RW_INTR);
@@ -1990,17 +1989,6 @@ wpi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		}
 		break;
 
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-
-		if (error == ENETRESET)
-			error = 0;
-		break;
-
 	case SIOCS80211POWER:
 		error = ieee80211_ioctl(ifp, cmd, data);
 		if (error != ENETRESET)
diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c
index 12c9f9f23a2..6d626aaae02 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.92 2017/01/22 10:17:39 dlg Exp $ */
+/*      $OpenBSD: if_malo.c,v 1.93 2017/10/26 15:00:28 mpi Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -362,10 +362,8 @@ int
 cmalo_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct malo_softc *sc = ifp->if_softc;
-	struct ieee80211com *ic = &sc->sc_ic;
 	struct ieee80211_nodereq_all *na;
 	struct ieee80211_nodereq *nr;
-	struct ifreq *ifr;
 	int i, j, s, error = 0;
 
 	s = splnet();
@@ -394,15 +392,6 @@ cmalo_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 				cmalo_stop(sc);
 		}
 		break;
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-		if (error == ENETRESET)
-			error = 0;
-		break;
 	case SIOCS80211SCAN:
 		cmalo_cmd_set_scan(sc);
 		break;
diff --git a/sys/dev/usb/if_athn_usb.c b/sys/dev/usb/if_athn_usb.c
index b5726cb61e7..45a160eea26 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.47 2017/04/08 02:57:25 deraadt Exp $	*/
+/*	$OpenBSD: if_athn_usb.c,v 1.48 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr>
@@ -2121,7 +2121,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 ifreq *ifr;
 	int s, error = 0;
 
 	if (usbd_is_dying(usc->sc_udev))
@@ -2144,15 +2143,6 @@ athn_usb_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 				athn_usb_stop(ifp);
 		}
 		break;
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-		if (error == ENETRESET)
-			error = 0;
-		break;
 	case SIOCS80211CHANNEL:
 		error = ieee80211_ioctl(ifp, cmd, data);
 		if (error == ENETRESET &&
diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c
index d10017d61ee..f3f9019bc49 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.59 2017/07/20 22:29:26 stsp Exp $	*/
+/*	$OpenBSD: if_otus.c,v 1.60 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -1469,7 +1469,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 ifreq *ifr;
 	int s, error = 0;
 
 	if (usbd_is_dying(sc->sc_udev))
@@ -1497,15 +1496,6 @@ otus_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 
 		sc->sc_if_flags = ifp->if_flags;
 		break;
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-		if (error == ENETRESET)
-			error = 0;
-		break;
 	case SIOCS80211CHANNEL:
 		error = ieee80211_ioctl(ifp, cmd, data);
 		if (error == ENETRESET &&
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index 9dd16fabd24..66ded63552f 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.143 2017/07/03 09:21:09 kevlo Exp $	*/
+/*	$OpenBSD: if_ral.c,v 1.144 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
@@ -1299,7 +1299,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 ifreq *ifr;
 	int s, error = 0;
 
 	if (usbd_is_dying(sc->sc_udev))
@@ -1325,17 +1324,6 @@ ural_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		}
 		break;
 
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-
-		if (error == ENETRESET)
-			error = 0;
-		break;
-
 	case SIOCS80211CHANNEL:
 		/*
 		 * This allows for fast channel switching in monitor mode
diff --git a/sys/dev/usb/if_rsu.c b/sys/dev/usb/if_rsu.c
index 4b536dde03f..aa23626b21f 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.40 2017/07/21 13:15:05 stsp Exp $	*/
+/*	$OpenBSD: if_rsu.c,v 1.41 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1674,8 +1674,6 @@ int
 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 ifreq *ifr;
 	int s, error = 0;
 
 	if (usbd_is_dying(sc->sc_udev))
@@ -1698,15 +1696,6 @@ rsu_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 				rsu_stop(ifp);
 		}
 		break;
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-		if (error == ENETRESET)
-			error = 0;
-		break;
 	default:
 		error = ieee80211_ioctl(ifp, cmd, data);
 	}
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index a025da21fe0..f75b35021ac 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.122 2017/07/03 09:21:09 kevlo Exp $	*/
+/*	$OpenBSD: if_rum.c,v 1.123 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -1306,7 +1306,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 ifreq *ifr;
 	int s, error = 0;
 
 	if (usbd_is_dying(sc->sc_udev))
@@ -1332,17 +1331,6 @@ rum_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		}
 		break;
 
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-
-		if (error == ENETRESET)
-			error = 0;
-		break;
-
 	case SIOCS80211CHANNEL:
 		/*
 		 * This allows for fast channel switching in monitor mode
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index 06580940511..35b1f974605 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.123 2017/08/14 05:52:21 stsp Exp $	*/
+/*	$OpenBSD: if_run.c,v 1.124 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -2593,7 +2593,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 ifreq *ifr;
 	int s, error = 0;
 
 	if (usbd_is_dying(sc->sc_udev))
@@ -2617,17 +2616,6 @@ run_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		}
 		break;
 
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-
-		if (error == ENETRESET)
-			error = 0;
-		break;
-
 	case SIOCS80211CHANNEL:
 		/*
 		 * This allows for fast channel switching in monitor mode
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c
index 3fa4118b076..0df977cef3c 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.81 2017/07/28 10:50:56 bluhm Exp $	*/
+/*	$OpenBSD: if_uath.c,v 1.82 2017/10/26 15:00:28 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -1532,9 +1532,6 @@ uath_watchdog(struct ifnet *ifp)
 int
 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 ifreq *ifr;
 	int s, error = 0;
 
 	s = splnet();
@@ -1553,16 +1550,6 @@ uath_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		}
 		break;
 
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-		if (error == ENETRESET)
-			error = 0;
-		break;
-
 	default:
 		error = ieee80211_ioctl(ifp, cmd, data);
 	}
diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c
index 5d3ce0b8118..2731503b671 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.80 2017/03/26 15:31:15 deraadt Exp $ */
+/*	$OpenBSD: if_upgt.c,v 1.81 2017/10/26 15:00:28 mpi Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -1126,7 +1126,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 ifreq *ifr;
 	int s, error = 0;
 	uint8_t chan;
 
@@ -1145,15 +1144,6 @@ upgt_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 				upgt_stop(sc);
 		}
 		break;
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ifr = (struct ifreq *)data;
-		error = (cmd == SIOCADDMULTI) ?
-		    ether_addmulti(ifr, &ic->ic_ac) :
-		    ether_delmulti(ifr, &ic->ic_ac);
-		if (error == ENETRESET)
-			error = 0;
-		break;
 	case SIOCS80211CHANNEL:
 		/* allow fast channel switching in monitor mode */
 		error = ieee80211_ioctl(ifp, cmd, data);
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 279f6c54e03..8b967571e28 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_ioctl.c,v 1.53 2017/07/19 22:04:46 stsp Exp $	*/
+/*	$OpenBSD: ieee80211_ioctl.c,v 1.54 2017/10/26 15:00:28 mpi Exp $	*/
 /*	$NetBSD: ieee80211_ioctl.c,v 1.15 2004/05/06 02:58:16 dyoung Exp $	*/
 
 /*-
@@ -841,6 +841,14 @@ ieee80211_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		ic->ic_flags = (ic->ic_flags & ~IEEE80211_F_USERMASK) | flags;
 		error = ENETRESET;
 		break;
+	case SIOCADDMULTI:
+	case SIOCDELMULTI:
+		error = (cmd == SIOCADDMULTI) ?
+		    ether_addmulti(ifr, &ic->ic_ac) :
+		    ether_delmulti(ifr, &ic->ic_ac);
+		if (error == ENETRESET)
+			error = 0;
+		break;
 	default:
 		error = ether_ioctl(ifp, &ic->ic_ac, cmd, data);
 	}