[src/trunk]: src/sys/dev/pci SIOCS is 'S'et function and the ioctl argument i...

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

details:   https://anonhg.NetBSD.org/src/rev/1fdb207315a3
branches:  trunk
changeset: 998627:1fdb207315a3
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Apr 24 11:18:20 2019 +0000

description:
SIOCS is 'S'et function and the ioctl argument is ifreq.
SIOCG is 'G'et function and the ioctl argument is ifmediareq.
Before this change, SIOCG modify sc->sc_flowflags unexpectedly.
Don't hook SIOCGIFMEDIA because this driver uses MII(4) and ether_ioctl has
the hook(if_ethersubr.c rev. 1.160). This driver might require some additional
fixes for SIOCSIFMTU and other ioctl()s.

XXX pullup-[78].

diffstat:

 sys/arch/arm/imx/if_enet.c |  5 ++---
 sys/dev/pci/if_wm.c        |  5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 66228b39df5f -r 1fdb207315a3 sys/arch/arm/imx/if_enet.c
--- a/sys/arch/arm/imx/if_enet.c        Wed Apr 24 11:12:12 2019 +0000
+++ b/sys/arch/arm/imx/if_enet.c        Wed Apr 24 11:18:20 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_enet.c,v 1.18 2019/04/11 08:50:59 msaitoh Exp $     */
+/*     $NetBSD: if_enet.c,v 1.19 2019/04/24 11:18:20 msaitoh Exp $     */
 
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.18 2019/04/11 08:50:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.19 2019/04/24 11:18:20 msaitoh Exp $");
 
 #include "vlan.h"
 
@@ -1041,7 +1041,6 @@
                }
                break;
        case SIOCSIFMEDIA:
-       case SIOCGIFMEDIA:
                /* Flow control requires full-duplex mode. */
                if (IFM_SUBTYPE(ifr->ifr_media) == IFM_AUTO ||
                    (ifr->ifr_media & IFM_FDX) == 0)
diff -r 66228b39df5f -r 1fdb207315a3 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Wed Apr 24 11:12:12 2019 +0000
+++ b/sys/dev/pci/if_wm.c       Wed Apr 24 11:18:20 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.633 2019/04/24 10:21:22 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.634 2019/04/24 11:18:20 msaitoh Exp $      */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.633 2019/04/24 10:21:22 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.634 2019/04/24 11:18:20 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -3366,7 +3366,6 @@
 #endif
        switch (cmd) {
        case SIOCSIFMEDIA:
-       case SIOCGIFMEDIA:
                WM_CORE_LOCK(sc);
                /* Flow control requires full-duplex mode. */
                if (IFM_SUBTYPE(ifr->ifr_media) == IFM_AUTO ||