[src/trunk]: src/sys/dev Remove SIOC[GS]IFMEDIA because ieee80211_ioctl() doe...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4e485c1529ee
branches:  trunk
changeset: 846940:4e485c1529ee
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Dec 05 03:11:40 2019 +0000

description:
Remove SIOC[GS]IFMEDIA because ieee80211_ioctl() does the same thing.

diffstat:

 sys/dev/ic/awi.c     |   9 ++-------
 sys/dev/ic/wi.c      |   9 ++-------
 sys/dev/usb/if_atu.c |  10 ++--------
 3 files changed, 6 insertions(+), 22 deletions(-)

diffs (110 lines):

diff -r fea1b4ee0337 -r 4e485c1529ee sys/dev/ic/awi.c
--- a/sys/dev/ic/awi.c  Thu Dec 05 00:31:14 2019 +0000
+++ b/sys/dev/ic/awi.c  Thu Dec 05 03:11:40 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: awi.c,v 1.98 2019/05/28 07:41:48 msaitoh Exp $ */
+/*     $NetBSD: awi.c,v 1.99 2019/12/05 03:11:40 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.98 2019/05/28 07:41:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.99 2019/12/05 03:11:40 msaitoh Exp $");
 
 #include "opt_inet.h"
 
@@ -833,7 +833,6 @@
 awi_ioctl(struct ifnet *ifp, u_long cmd, void *data)
 {
        struct awi_softc *sc = ifp->if_softc;
-       struct ifreq *ifr = (struct ifreq *)data;
        int s, error;
 
        s = splnet();
@@ -858,10 +857,6 @@
                } else if (sc->sc_enabled)
                        awi_stop(ifp, 1);
                break;
-       case SIOCSIFMEDIA:
-       case SIOCGIFMEDIA:
-               error = ifmedia_ioctl(ifp, ifr, &sc->sc_ic.ic_media, cmd);
-               break;
        case SIOCADDMULTI:
        case SIOCDELMULTI:
                error = ether_ioctl(ifp, cmd, data);
diff -r fea1b4ee0337 -r 4e485c1529ee sys/dev/ic/wi.c
--- a/sys/dev/ic/wi.c   Thu Dec 05 00:31:14 2019 +0000
+++ b/sys/dev/ic/wi.c   Thu Dec 05 03:11:40 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wi.c,v 1.253 2019/05/28 07:41:48 msaitoh Exp $ */
+/*     $NetBSD: wi.c,v 1.254 2019/12/05 03:11:40 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.253 2019/05/28 07:41:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.254 2019/12/05 03:11:40 msaitoh Exp $");
 
 #define WI_HERMES_AUTOINC_WAR  /* Work around data write autoinc bug. */
 #define WI_HERMES_STATS_WAR    /* Work around stats counter bug. */
@@ -1419,7 +1419,6 @@
 {
        struct wi_softc *sc = ifp->if_softc;
        struct ieee80211com *ic = &sc->sc_ic;
-       struct ifreq *ifr = (struct ifreq *)data;
        int s, error = 0;
 
        if (!device_is_active(sc->sc_dev))
@@ -1453,10 +1452,6 @@
                } else if (sc->sc_enabled)
                        wi_stop(ifp, 1);
                break;
-       case SIOCSIFMEDIA:
-       case SIOCGIFMEDIA:
-               error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd);
-               break;
        case SIOCADDMULTI:
        case SIOCDELMULTI:
                if ((error = ether_ioctl(ifp, cmd, data)) == ENETRESET) {
diff -r fea1b4ee0337 -r 4e485c1529ee sys/dev/usb/if_atu.c
--- a/sys/dev/usb/if_atu.c      Thu Dec 05 00:31:14 2019 +0000
+++ b/sys/dev/usb/if_atu.c      Thu Dec 05 03:11:40 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_atu.c,v 1.67 2019/12/01 12:47:10 maxv Exp $ */
+/*     $NetBSD: if_atu.c,v 1.68 2019/12/05 03:11:41 msaitoh Exp $ */
 /*     $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
 /*
  * Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.67 2019/12/01 12:47:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.68 2019/12/05 03:11:41 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -2138,17 +2138,11 @@
 atu_ioctl(struct ifnet *ifp, u_long command, void *data)
 {
        struct atu_softc        *sc = ifp->if_softc;
-       struct ifreq            *ifr = (struct ifreq *)data;
        struct ieee80211com     *ic = &sc->sc_ic;
        int                     err = 0, s;
 
        s = splnet();
        switch (command) {
-       case SIOCSIFMEDIA:
-       case SIOCGIFMEDIA:
-               err = ifmedia_ioctl(ifp, ifr, &ic->ic_media, command);
-               break;
-
        default:
                DPRINTFN(15, ("%s: ieee80211_ioctl (%lu)\n",
                    device_xname(sc->atu_dev), command));