Module Name: src
Committed By: martin
Date: Tue May 14 11:40:42 UTC 2019
Modified Files:
src/sys/arch/arm/imx [netbsd-8]: if_enet.c
src/sys/dev/pci [netbsd-8]: if_wm.c
Log Message:
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].
To generate a diff of this commit:
cvs rdiff -u -r1.10.8.1 -r1.10.8.2 src/sys/arch/arm/imx/if_enet.c
cvs rdiff -u -r1.508.4.31 -r1.508.4.32 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/imx/if_enet.c
diff -u src/sys/arch/arm/imx/if_enet.c:1.10.8.1 src/sys/arch/arm/imx/if_enet.c:1.10.8.2
--- src/sys/arch/arm/imx/if_enet.c:1.10.8.1 Mon May 13 12:40:13 2019
+++ src/sys/arch/arm/imx/if_enet.c Tue May 14 11:40:41 2019
@@ -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 <r...@nerv.org>
@@ -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 @@ enet_ioctl(struct ifnet *ifp, u_long com
}
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)
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.508.4.31 src/sys/dev/pci/if_wm.c:1.508.4.32
--- src/sys/dev/pci/if_wm.c:1.508.4.31 Thu Mar 7 17:11:53 2019
+++ src/sys/dev/pci/if_wm.c Tue May 14 11:40:41 2019
@@ -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 @@ wm_ioctl(struct ifnet *ifp, u_long cmd,
#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 ||
