[src/trunk]: src/sys/dev/marvell This driver uses MII(4) and have hook SIOC[G...

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

details:   https://anonhg.NetBSD.org/src/rev/3acc945d5c4e
branches:  trunk
changeset: 456129:3acc945d5c4e
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Apr 24 10:56:24 2019 +0000

description:
This driver uses MII(4) and have hook SIOC[GS]IFMEDIA which just pass to
ifmedia_ioctl(), the hook is not required because ether_ioctl has it
(if_ethersubr.c rev. 1.160). This driver might require some additional fixes
for SIOCSIFMTU and other ioctl()s.

diffstat:

 sys/dev/marvell/if_mvxpe.c |  13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diffs (37 lines):

diff -r e53816c33e06 -r 3acc945d5c4e sys/dev/marvell/if_mvxpe.c
--- a/sys/dev/marvell/if_mvxpe.c        Wed Apr 24 10:43:00 2019 +0000
+++ b/sys/dev/marvell/if_mvxpe.c        Wed Apr 24 10:56:24 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_mvxpe.c,v 1.22 2019/03/18 11:38:03 msaitoh Exp $    */
+/*     $NetBSD: if_mvxpe.c,v 1.23 2019/04/24 10:56:24 msaitoh Exp $    */
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.22 2019/03/18 11:38:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.23 2019/04/24 10:56:24 msaitoh Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -1727,18 +1727,9 @@
 mvxpe_ioctl(struct ifnet *ifp, u_long cmd, void *data)
 {
        struct mvxpe_softc *sc = ifp->if_softc;
-       struct ifreq *ifr = data;
        int error = 0;
-       int s;
 
        switch (cmd) {
-       case SIOCGIFMEDIA:
-       case SIOCSIFMEDIA:
-               DPRINTIFNET(ifp, 2, "mvxpe_ioctl MEDIA\n");
-               s = splnet(); /* XXX: is there suitable mutex? */
-               error = ifmedia_ioctl(ifp, ifr, &sc->sc_mii.mii_media, cmd);
-               splx(s);
-               break;
        default:
                DPRINTIFNET(ifp, 2, "mvxpe_ioctl ETHER\n");
                error = ether_ioctl(ifp, cmd, data);