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

ok jsg@, stsp@

8 files changed, 8 insertions, 96 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 &&