[src/netbsd-8]: src/sys Pull up following revision(s) (requested by msaitoh i...

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

details:   https://anonhg.NetBSD.org/src/rev/c506c58a11db
branches:  netbsd-8
changeset: 451294:c506c58a11db
user:      martin <martin%NetBSD.org@localhost>
date:      Tue May 14 11:40:41 2019 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1267):

        sys/arch/arm/imx/if_enet.c: revision 1.19
        sys/dev/pci/if_wm.c: revision 1.634

SIOCS is 'S'et function and the ioctl argument is ifreq.
SIOCG is 'G'et function and the ioctl armument is ifmediareq.

Before this change, SIOCG modify sc->sc_flowflags unexpectedly.


Don't hook SIOCGIFMEDIA becauise this driver uses MII(4) and ether_ioctl has
the hook(if_ethersubr.c rev. 1.160).
real bug because the modification is overriden in ifmedia_ioctl().

 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 6a6fca974bf6 -r c506c58a11db sys/arch/arm/imx/if_enet.c
--- a/sys/arch/arm/imx/if_enet.c        Tue May 14 11:37:12 2019 +0000
+++ b/sys/arch/arm/imx/if_enet.c        Tue May 14 11:40:41 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_enet.c,v 1.10.8.1 2019/05/13 12:40:13 martin Exp $  */
+/*     $NetBSD: if_enet.c,v 1.10.8.2 2019/05/14 11:40:41 martin 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.10.8.1 2019/05/13 12:40:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.10.8.2 2019/05/14 11:40:41 martin Exp $");
 
 #include "vlan.h"
 
@@ -1036,7 +1036,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 6a6fca974bf6 -r c506c58a11db sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Tue May 14 11:37:12 2019 +0000
+++ b/sys/dev/pci/if_wm.c       Tue May 14 11:40:41 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.508.4.31 2019/03/07 17:11:53 martin Exp $  */
+/*     $NetBSD: if_wm.c,v 1.508.4.32 2019/05/14 11:40:41 martin 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.508.4.31 2019/03/07 17:11:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.32 2019/05/14 11:40:41 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -3321,7 +3321,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 ||