Module Name: src
Committed By: msaitoh
Date: Mon Apr 22 08:05:01 UTC 2019
Modified Files:
src/sys/arch/arm/at91: at91emac.c
src/sys/arch/arm/gemini: if_gmc.c
src/sys/arch/arm/sunxi: sunxi_emac.c
src/sys/dev/cadence: if_cemac.c
src/sys/dev/ic: elinkxl.c lan9118.c tulip.c
src/sys/dev/marvell: if_mvgbe.c
src/sys/dev/pci: if_et.c if_lii.c
Log Message:
On drivers which use 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). These drivers don't return ENETRESET in
ifmedia_ioctl(), so no functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/at91/at91emac.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/gemini/if_gmc.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/sunxi/sunxi_emac.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/cadence/if_cemac.c
cvs rdiff -u -r1.127 -r1.128 src/sys/dev/ic/elinkxl.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/lan9118.c
cvs rdiff -u -r1.192 -r1.193 src/sys/dev/ic/tulip.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/marvell/if_mvgbe.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/if_et.c src/sys/dev/pci/if_lii.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/at91/at91emac.c
diff -u src/sys/arch/arm/at91/at91emac.c:1.24 src/sys/arch/arm/at91/at91emac.c:1.25
--- src/sys/arch/arm/at91/at91emac.c:1.24 Tue Feb 5 06:17:00 2019
+++ src/sys/arch/arm/at91/at91emac.c Mon Apr 22 08:05:00 2019
@@ -1,5 +1,5 @@
-/* $Id: at91emac.c,v 1.24 2019/02/05 06:17:00 msaitoh Exp $ */
-/* $NetBSD: at91emac.c,v 1.24 2019/02/05 06:17:00 msaitoh Exp $ */
+/* $Id: at91emac.c,v 1.25 2019/04/22 08:05:00 msaitoh Exp $ */
+/* $NetBSD: at91emac.c,v 1.25 2019/04/22 08:05:00 msaitoh Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.24 2019/02/05 06:17:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.25 2019/04/22 08:05:00 msaitoh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -454,6 +454,7 @@ emac_init(struct emac_softc *sc)
sc->sc_mii.mii_readreg = emac_mii_readreg;
sc->sc_mii.mii_writereg = emac_mii_writereg;
sc->sc_mii.mii_statchg = emac_statchg;
+ sc->sc_ec.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, emac_mediachange,
emac_mediastatus);
mii_attach((device_t )sc, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
@@ -594,15 +595,10 @@ static int
emac_ifioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct emac_softc *sc = ifp->if_softc;
- struct ifreq *ifr = (struct ifreq *)data;
int s, error;
s = splnet();
switch(cmd) {
- case SIOCSIFMEDIA:
- case SIOCGIFMEDIA:
- error = ifmedia_ioctl(ifp, ifr, &sc->sc_mii.mii_media, cmd);
- break;
default:
error = ether_ioctl(ifp, cmd, data);
if (error == ENETRESET) {
Index: src/sys/arch/arm/gemini/if_gmc.c
diff -u src/sys/arch/arm/gemini/if_gmc.c:1.7 src/sys/arch/arm/gemini/if_gmc.c:1.8
--- src/sys/arch/arm/gemini/if_gmc.c:1.7 Mon Feb 20 08:25:57 2017
+++ src/sys/arch/arm/gemini/if_gmc.c Mon Apr 22 08:05:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gmc.c,v 1.7 2017/02/20 08:25:57 ozaki-r Exp $ */
+/* $NetBSD: if_gmc.c,v 1.8 2019/04/22 08:05:00 msaitoh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -47,7 +47,7 @@
#include <net/if_ether.h>
#include <net/if_dl.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gmc.c,v 1.7 2017/02/20 08:25:57 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gmc.c,v 1.8 2019/04/22 08:05:00 msaitoh Exp $");
#define MAX_TXSEG 32
@@ -353,16 +353,11 @@ static int
gmc_ifioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct gmc_softc * const sc = ifp->if_softc;
- struct ifreq * const ifr = data;
int s;
int error;
s = splnet();
switch (cmd) {
- case SIOCSIFMEDIA:
- case SIOCGIFMEDIA:
- error = ifmedia_ioctl(ifp, ifr, &sc->sc_mii.mii_media, cmd);
- break;
default:
error = ether_ioctl(ifp, cmd, data);
if (error == ENETRESET) {
Index: src/sys/arch/arm/sunxi/sunxi_emac.c
diff -u src/sys/arch/arm/sunxi/sunxi_emac.c:1.23 src/sys/arch/arm/sunxi/sunxi_emac.c:1.24
--- src/sys/arch/arm/sunxi/sunxi_emac.c:1.23 Tue Mar 5 08:25:02 2019
+++ src/sys/arch/arm/sunxi/sunxi_emac.c Mon Apr 22 08:05:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_emac.c,v 1.23 2019/03/05 08:25:02 msaitoh Exp $ */
+/* $NetBSD: sunxi_emac.c,v 1.24 2019/04/22 08:05:01 msaitoh Exp $ */
/*-
* Copyright (c) 2016-2017 Jared McNeill <[email protected]>
@@ -33,7 +33,7 @@
#include "opt_net_mpsafe.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.23 2019/03/05 08:25:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.24 2019/04/22 08:05:01 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -909,7 +909,6 @@ sunxi_emac_ioctl(struct ifnet *ifp, u_lo
{
struct sunxi_emac_softc *sc = ifp->if_softc;
struct mii_data *mii = &sc->mii;
- struct ifreq *ifr = data;
int error, s;
#ifndef EMAC_MPSAFE
@@ -917,16 +916,6 @@ sunxi_emac_ioctl(struct ifnet *ifp, u_lo
#endif
switch (cmd) {
- case SIOCSIFMEDIA:
- case SIOCGIFMEDIA:
-#ifdef EMAC_MPSAFE
- s = splnet();
-#endif
- error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, cmd);
-#ifdef EMAC_MPSAFE
- splx(s);
-#endif
- break;
default:
#ifdef EMAC_MPSAFE
s = splnet();
Index: src/sys/dev/cadence/if_cemac.c
diff -u src/sys/dev/cadence/if_cemac.c:1.16 src/sys/dev/cadence/if_cemac.c:1.17
--- src/sys/dev/cadence/if_cemac.c:1.16 Tue Feb 5 06:17:02 2019
+++ src/sys/dev/cadence/if_cemac.c Mon Apr 22 08:05:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cemac.c,v 1.16 2019/02/05 06:17:02 msaitoh Exp $ */
+/* $NetBSD: if_cemac.c,v 1.17 2019/04/22 08:05:01 msaitoh Exp $ */
/*
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.16 2019/02/05 06:17:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.17 2019/04/22 08:05:01 msaitoh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -740,15 +740,10 @@ static int
cemac_ifioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct cemac_softc *sc = ifp->if_softc;
- struct ifreq *ifr = (struct ifreq *)data;
int s, error;
s = splnet();
switch(cmd) {
- case SIOCSIFMEDIA:
- case SIOCGIFMEDIA:
- error = ifmedia_ioctl(ifp, ifr, &sc->sc_mii.mii_media, cmd);
- break;
default:
error = ether_ioctl(ifp, cmd, data);
if (error != ENETRESET)
Index: src/sys/dev/ic/elinkxl.c
diff -u src/sys/dev/ic/elinkxl.c:1.127 src/sys/dev/ic/elinkxl.c:1.128
--- src/sys/dev/ic/elinkxl.c:1.127 Tue Feb 5 06:17:02 2019
+++ src/sys/dev/ic/elinkxl.c Mon Apr 22 08:05:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxl.c,v 1.127 2019/02/05 06:17:02 msaitoh Exp $ */
+/* $NetBSD: elinkxl.c,v 1.128 2019/04/22 08:05:01 msaitoh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.127 2019/02/05 06:17:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.128 2019/04/22 08:05:01 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -375,6 +375,7 @@ ex_config(struct ex_softc *sc)
sc->ex_mii.mii_readreg = ex_mii_readreg;
sc->ex_mii.mii_writereg = ex_mii_writereg;
sc->ex_mii.mii_statchg = ex_mii_statchg;
+ sc->sc_ethercom.ec_mii = &sc->ex_mii;
ifmedia_init(&sc->ex_mii.mii_media, IFM_IMASK, ex_media_chg,
ex_media_stat);
@@ -1439,16 +1440,11 @@ int
ex_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct ex_softc *sc = ifp->if_softc;
- struct ifreq *ifr = (struct ifreq *)data;
int s, error;
s = splnet();
switch (cmd) {
- case SIOCSIFMEDIA:
- case SIOCGIFMEDIA:
- error = ifmedia_ioctl(ifp, ifr, &sc->ex_mii.mii_media, cmd);
- break;
default:
if ((error = ether_ioctl(ifp, cmd, data)) != ENETRESET)
break;
Index: src/sys/dev/ic/lan9118.c
diff -u src/sys/dev/ic/lan9118.c:1.29 src/sys/dev/ic/lan9118.c:1.30
--- src/sys/dev/ic/lan9118.c:1.29 Tue Jan 22 15:34:04 2019
+++ src/sys/dev/ic/lan9118.c Mon Apr 22 08:05:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lan9118.c,v 1.29 2019/01/22 15:34:04 jmcneill Exp $ */
+/* $NetBSD: lan9118.c,v 1.30 2019/04/22 08:05:01 msaitoh Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lan9118.c,v 1.29 2019/01/22 15:34:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lan9118.c,v 1.30 2019/04/22 08:05:01 msaitoh Exp $");
/*
* The LAN9118 Family
@@ -232,6 +232,7 @@ lan9118_attach(struct lan9118_softc *sc)
sc->sc_ec.ec_capabilities |= ETHERCAP_VLAN_MTU;
#endif
+ sc->sc_ec.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, 0,
lan9118_ifm_change, lan9118_ifm_status);
sc->sc_mii.mii_ifp = ifp;
@@ -505,12 +506,6 @@ lan9118_ioctl(struct ifnet *ifp, u_long
error = 0;
break;
- case SIOCGIFMEDIA:
- case SIOCSIFMEDIA:
- DPRINTFN(2, ("%s: MEDIA\n", __func__));
- error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
- break;
-
default:
DPRINTFN(2, ("%s: ETHER\n", __func__));
error = ether_ioctl(ifp, command, data);
Index: src/sys/dev/ic/tulip.c
diff -u src/sys/dev/ic/tulip.c:1.192 src/sys/dev/ic/tulip.c:1.193
--- src/sys/dev/ic/tulip.c:1.192 Tue Jan 22 03:42:26 2019
+++ src/sys/dev/ic/tulip.c Mon Apr 22 08:05:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tulip.c,v 1.192 2019/01/22 03:42:26 msaitoh Exp $ */
+/* $NetBSD: tulip.c,v 1.193 2019/04/22 08:05:01 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.192 2019/01/22 03:42:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.193 2019/04/22 08:05:01 msaitoh Exp $");
#include <sys/param.h>
@@ -983,16 +983,11 @@ static int
tlp_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct tulip_softc *sc = ifp->if_softc;
- struct ifreq *ifr = (struct ifreq *)data;
int s, error;
s = splnet();
switch (cmd) {
- case SIOCSIFMEDIA:
- case SIOCGIFMEDIA:
- error = ifmedia_ioctl(ifp, ifr, &sc->sc_mii.mii_media, cmd);
- break;
default:
error = ether_ioctl(ifp, cmd, data);
if (error == ENETRESET) {
@@ -4374,6 +4369,7 @@ tlp_21040_tmsw_init(struct tulip_softc *
};
struct tulip_21x4x_media *tm;
+ sc->sc_ethercom.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
@@ -4409,6 +4405,7 @@ tlp_21040_tp_tmsw_init(struct tulip_soft
TULIP_ROM_MB_MEDIA_TP_FDX,
};
+ sc->sc_ethercom.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
@@ -4426,6 +4423,7 @@ tlp_21040_auibnc_tmsw_init(struct tulip_
TULIP_ROM_MB_MEDIA_AUI,
};
+ sc->sc_ethercom.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
@@ -4451,6 +4449,7 @@ tlp_21041_tmsw_init(struct tulip_softc *
uint16_t romdef;
uint8_t mb;
+ sc->sc_ethercom.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
@@ -4616,6 +4615,7 @@ tlp_2114x_isv_tmsw_init(struct tulip_sof
sc->sc_mii.mii_readreg = tlp_bitbang_mii_readreg;
sc->sc_mii.mii_writereg = tlp_bitbang_mii_writereg;
sc->sc_mii.mii_statchg = sc->sc_statchg;
+ sc->sc_ethercom.ec_mii = &sc->sc_mii;
/*
* Ignore `instance'; we may get a mixture of SIA and MII
@@ -5441,6 +5441,7 @@ tlp_sio_mii_tmsw_init(struct tulip_softc
sc->sc_mii.mii_readreg = tlp_bitbang_mii_readreg;
sc->sc_mii.mii_writereg = tlp_bitbang_mii_writereg;
sc->sc_mii.mii_statchg = sc->sc_statchg;
+ sc->sc_ethercom.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
@@ -5488,6 +5489,7 @@ tlp_pnic_tmsw_init(struct tulip_softc *s
sc->sc_mii.mii_readreg = tlp_pnic_mii_readreg;
sc->sc_mii.mii_writereg = tlp_pnic_mii_writereg;
sc->sc_mii.mii_statchg = sc->sc_statchg;
+ sc->sc_ethercom.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
@@ -5885,6 +5887,7 @@ tlp_pmac_tmsw_init(struct tulip_softc *s
sc->sc_mii.mii_readreg = tlp_bitbang_mii_readreg;
sc->sc_mii.mii_writereg = tlp_bitbang_mii_writereg;
sc->sc_mii.mii_statchg = sc->sc_statchg;
+ sc->sc_ethercom.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
if (sc->sc_chip == TULIP_CHIP_MX98713 ||
@@ -5960,6 +5963,7 @@ tlp_al981_tmsw_init(struct tulip_softc *
sc->sc_mii.mii_readreg = tlp_al981_mii_readreg;
sc->sc_mii.mii_writereg = tlp_al981_mii_writereg;
sc->sc_mii.mii_statchg = sc->sc_statchg;
+ sc->sc_ethercom.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
@@ -5995,6 +5999,7 @@ tlp_an985_tmsw_init(struct tulip_softc *
sc->sc_mii.mii_readreg = tlp_bitbang_mii_readreg;
sc->sc_mii.mii_writereg = tlp_bitbang_mii_writereg;
sc->sc_mii.mii_statchg = sc->sc_statchg;
+ sc->sc_ethercom.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, 1,
@@ -6032,6 +6037,7 @@ tlp_dm9102_tmsw_init(struct tulip_softc
sc->sc_mii.mii_readreg = tlp_bitbang_mii_readreg;
sc->sc_mii.mii_writereg = tlp_bitbang_mii_writereg;
sc->sc_mii.mii_statchg = sc->sc_statchg;
+ sc->sc_ethercom.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
@@ -6115,6 +6121,7 @@ tlp_asix_tmsw_init(struct tulip_softc *s
sc->sc_mii.mii_readreg = tlp_bitbang_mii_readreg;
sc->sc_mii.mii_writereg = tlp_bitbang_mii_writereg;
sc->sc_mii.mii_statchg = sc->sc_statchg;
+ sc->sc_ethercom.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
@@ -6194,6 +6201,7 @@ tlp_rs7112_tmsw_init(struct tulip_softc
sc->sc_mii.mii_readreg = tlp_bitbang_mii_readreg;
sc->sc_mii.mii_writereg = tlp_bitbang_mii_writereg;
sc->sc_mii.mii_statchg = sc->sc_statchg;
+ sc->sc_ethercom.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
Index: src/sys/dev/marvell/if_mvgbe.c
diff -u src/sys/dev/marvell/if_mvgbe.c:1.53 src/sys/dev/marvell/if_mvgbe.c:1.54
--- src/sys/dev/marvell/if_mvgbe.c:1.53 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/marvell/if_mvgbe.c Mon Apr 22 08:05:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mvgbe.c,v 1.53 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: if_mvgbe.c,v 1.54 2019/04/22 08:05:01 msaitoh Exp $ */
/*
* Copyright (c) 2007, 2008, 2013 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.53 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.54 2019/04/22 08:05:01 msaitoh Exp $");
#include "opt_multiprocessor.h"
@@ -1125,17 +1125,11 @@ static int
mvgbe_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct mvgbe_softc *sc = ifp->if_softc;
- struct ifreq *ifr = data;
int s, error = 0;
s = splnet();
switch (cmd) {
- case SIOCGIFMEDIA:
- case SIOCSIFMEDIA:
- DPRINTFN(2, ("mvgbe_ioctl MEDIA\n"));
- error = ifmedia_ioctl(ifp, ifr, &sc->sc_mii.mii_media, cmd);
- break;
default:
DPRINTFN(2, ("mvgbe_ioctl ETHER\n"));
error = ether_ioctl(ifp, cmd, data);
Index: src/sys/dev/pci/if_et.c
diff -u src/sys/dev/pci/if_et.c:1.21 src/sys/dev/pci/if_et.c:1.22
--- src/sys/dev/pci/if_et.c:1.21 Thu Apr 11 08:50:59 2019
+++ src/sys/dev/pci/if_et.c Mon Apr 22 08:05:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_et.c,v 1.21 2019/04/11 08:50:59 msaitoh Exp $ */
+/* $NetBSD: if_et.c,v 1.22 2019/04/22 08:05:01 msaitoh Exp $ */
/* $OpenBSD: if_et.c,v 1.11 2008/06/08 06:18:07 jsg Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.21 2019/04/11 08:50:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.22 2019/04/22 08:05:01 msaitoh Exp $");
#include "opt_inet.h"
#include "vlan.h"
@@ -1032,7 +1032,6 @@ int
et_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct et_softc *sc = ifp->if_softc;
- struct ifreq *ifr = (struct ifreq *)data;
int s, error = 0;
s = splnet();
@@ -1059,10 +1058,6 @@ et_ioctl(struct ifnet *ifp, u_long cmd,
}
sc->sc_if_flags = ifp->if_flags;
break;
- case SIOCSIFMEDIA:
- case SIOCGIFMEDIA:
- error = ifmedia_ioctl(ifp, ifr, &sc->sc_miibus.mii_media, cmd);
- break;
default:
error = ether_ioctl(ifp, cmd, data);
if (error == ENETRESET) {
Index: src/sys/dev/pci/if_lii.c
diff -u src/sys/dev/pci/if_lii.c:1.21 src/sys/dev/pci/if_lii.c:1.22
--- src/sys/dev/pci/if_lii.c:1.21 Thu Apr 11 08:50:59 2019
+++ src/sys/dev/pci/if_lii.c Mon Apr 22 08:05:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lii.c,v 1.21 2019/04/11 08:50:59 msaitoh Exp $ */
+/* $NetBSD: if_lii.c,v 1.22 2019/04/22 08:05:01 msaitoh Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.21 2019/04/11 08:50:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.22 2019/04/22 08:05:01 msaitoh Exp $");
#include <sys/param.h>
@@ -314,6 +314,7 @@ lii_attach(device_t parent, device_t sel
sc->sc_mii.mii_readreg = lii_mii_readreg;
sc->sc_mii.mii_writereg = lii_mii_writereg;
sc->sc_mii.mii_statchg = lii_mii_statchg;
+ sc->sc_ec.ec_mii = &sc->sc_mii;
ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, lii_media_change,
lii_media_status);
mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, 1,
@@ -1143,23 +1144,9 @@ lii_ioctl(struct ifnet *ifp, u_long cmd,
s = splnet();
- switch(cmd) {
- case SIOCADDMULTI:
- case SIOCDELMULTI:
- if ((error = ether_ioctl(ifp, cmd, data)) == ENETRESET) {
- if (ifp->if_flags & IFF_RUNNING)
- lii_setmulti(sc);
- error = 0;
- }
- break;
- case SIOCSIFMEDIA:
- case SIOCGIFMEDIA:
- error = ifmedia_ioctl(ifp, (struct ifreq *)data,
- &sc->sc_mii.mii_media, cmd);
- break;
+ switch (cmd) {
default:
- error = ether_ioctl(ifp, cmd, data);
- if (error == ENETRESET) {
+ if ((error = ether_ioctl(ifp, cmd, data)) == ENETRESET) {
if (ifp->if_flags & IFF_RUNNING)
lii_setmulti(sc);
error = 0;
