Module Name: src
Committed By: mrg
Date: Thu Aug 1 00:10:22 UTC 2019
Modified Files:
src/sys/dev/usb: if_aue.c if_auereg.h if_kue.c if_kuereg.h if_mue.c
if_smsc.c if_smscvar.h if_udav.c if_udavreg.h if_url.c if_urndis.c
Log Message:
remove unused code and use common ethernet media code where equivalent.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/usb/if_auereg.h
cvs rdiff -u -r1.96 -r1.97 src/sys/dev/usb/if_kue.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/usb/if_kuereg.h
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/usb/if_mue.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/usb/if_smsc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/if_smscvar.h
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/if_udavreg.h
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/usb/if_url.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/usb/if_urndis.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/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.154 src/sys/dev/usb/if_aue.c:1.155
--- src/sys/dev/usb/if_aue.c:1.154 Tue May 28 07:41:50 2019
+++ src/sys/dev/usb/if_aue.c Thu Aug 1 00:10:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.154 2019/05/28 07:41:50 msaitoh Exp $ */
+/* $NetBSD: if_aue.c,v 1.155 2019/08/01 00:10:22 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.154 2019/05/28 07:41:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.155 2019/08/01 00:10:22 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1028,7 +1028,6 @@ aue_rx_list_init(struct aue_softc *sc)
for (i = 0; i < AUE_RX_LIST_CNT; i++) {
c = &cd->aue_rx_chain[i];
c->aue_sc = sc;
- c->aue_idx = i;
if (aue_newbuf(sc, c, NULL) == ENOBUFS)
return ENOBUFS;
if (c->aue_xfer == NULL) {
@@ -1057,7 +1056,6 @@ aue_tx_list_init(struct aue_softc *sc)
for (i = 0; i < AUE_TX_LIST_CNT; i++) {
c = &cd->aue_tx_chain[i];
c->aue_sc = sc;
- c->aue_idx = i;
c->aue_mbuf = NULL;
if (c->aue_xfer == NULL) {
int err = usbd_create_xfer(sc->aue_ep[AUE_ENDPT_TX],
@@ -1520,19 +1518,13 @@ Static int
aue_ifmedia_upd(struct ifnet *ifp)
{
struct aue_softc *sc = ifp->if_softc;
- struct mii_data *mii = GET_MII(sc);
- int rc;
DPRINTFN(5,("%s: %s: enter\n", device_xname(sc->aue_dev), __func__));
if (sc->aue_dying)
return 0;
- sc->aue_link = 0;
-
- if ((rc = mii_mediachg(mii)) == ENXIO)
- return 0;
- return rc;
+ return ether_mediachange(ifp);
}
Static int
Index: src/sys/dev/usb/if_auereg.h
diff -u src/sys/dev/usb/if_auereg.h:1.29 src/sys/dev/usb/if_auereg.h:1.30
--- src/sys/dev/usb/if_auereg.h:1.29 Sun Jul 21 10:27:56 2019
+++ src/sys/dev/usb/if_auereg.h Thu Aug 1 00:10:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_auereg.h,v 1.29 2019/07/21 10:27:56 mrg Exp $ */
+/* $NetBSD: if_auereg.h,v 1.30 2019/08/01 00:10:22 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -212,7 +212,6 @@ struct aue_chain {
struct usbd_xfer *aue_xfer;
char *aue_buf;
struct mbuf *aue_mbuf;
- int aue_idx;
};
struct aue_cdata {
Index: src/sys/dev/usb/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.96 src/sys/dev/usb/if_kue.c:1.97
--- src/sys/dev/usb/if_kue.c:1.96 Tue May 28 07:41:50 2019
+++ src/sys/dev/usb/if_kue.c Thu Aug 1 00:10:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.96 2019/05/28 07:41:50 msaitoh Exp $ */
+/* $NetBSD: if_kue.c,v 1.97 2019/08/01 00:10:22 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.96 2019/05/28 07:41:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.97 2019/08/01 00:10:22 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -591,7 +591,6 @@ kue_rx_list_init(struct kue_softc *sc)
for (i = 0; i < KUE_RX_LIST_CNT; i++) {
c = &cd->kue_rx_chain[i];
c->kue_sc = sc;
- c->kue_idx = i;
if (c->kue_xfer == NULL) {
int error = usbd_create_xfer(sc->kue_ep[KUE_ENDPT_RX],
KUE_BUFSZ, 0, 0, &c->kue_xfer);
@@ -617,7 +616,6 @@ kue_tx_list_init(struct kue_softc *sc)
for (i = 0; i < KUE_TX_LIST_CNT; i++) {
c = &cd->kue_tx_chain[i];
c->kue_sc = sc;
- c->kue_idx = i;
if (c->kue_xfer == NULL) {
int error = usbd_create_xfer(sc->kue_ep[KUE_ENDPT_TX],
KUE_BUFSZ, 0, 0, &c->kue_xfer);
Index: src/sys/dev/usb/if_kuereg.h
diff -u src/sys/dev/usb/if_kuereg.h:1.22 src/sys/dev/usb/if_kuereg.h:1.23
--- src/sys/dev/usb/if_kuereg.h:1.22 Sun Jul 21 10:27:56 2019
+++ src/sys/dev/usb/if_kuereg.h Thu Aug 1 00:10:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kuereg.h,v 1.22 2019/07/21 10:27:56 mrg Exp $ */
+/* $NetBSD: if_kuereg.h,v 1.23 2019/08/01 00:10:22 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -147,7 +147,6 @@ struct kue_chain {
struct kue_softc *kue_sc;
struct usbd_xfer *kue_xfer;
uint8_t *kue_buf;
- int kue_idx;
};
struct kue_cdata {
Index: src/sys/dev/usb/if_mue.c
diff -u src/sys/dev/usb/if_mue.c:1.50 src/sys/dev/usb/if_mue.c:1.51
--- src/sys/dev/usb/if_mue.c:1.50 Wed May 29 09:04:01 2019
+++ src/sys/dev/usb/if_mue.c Thu Aug 1 00:10:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mue.c,v 1.50 2019/05/29 09:04:01 mlelstv Exp $ */
+/* $NetBSD: if_mue.c,v 1.51 2019/08/01 00:10:22 mrg Exp $ */
/* $OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $ */
/*
@@ -20,7 +20,7 @@
/* Driver for Microchip LAN7500/LAN7800 chipsets. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.50 2019/05/29 09:04:01 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.51 2019/08/01 00:10:22 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -121,7 +121,6 @@ static int mue_miibus_readreg(device_t,
static int mue_miibus_writereg(device_t, int, int, uint16_t);
static void mue_miibus_statchg(struct ifnet *);
static int mue_ifmedia_upd(struct ifnet *);
-static void mue_ifmedia_sts(struct ifnet *, struct ifmediareq *);
static uint8_t mue_eeprom_getbyte(struct mue_softc *, int, uint8_t *);
static int mue_read_eeprom(struct mue_softc *, uint8_t *, int, int);
@@ -458,28 +457,14 @@ mue_ifmedia_upd(struct ifnet *ifp)
struct mue_softc *sc = ifp->if_softc;
struct mii_data *mii = GET_MII(sc);
- sc->mue_link = 0; /* XXX */
+ sc->mue_link = 0;
if (mii->mii_instance) {
struct mii_softc *miisc;
LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
mii_phy_reset(miisc);
}
- return mii_mediachg(mii);
-}
-
-/*
- * Report current media status.
- */
-static void
-mue_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
-{
- struct mue_softc *sc = ifp->if_softc;
- struct mii_data *mii = GET_MII(sc);
-
- mii_pollstat(mii);
- ifmr->ifm_active = mii->mii_media_active;
- ifmr->ifm_status = mii->mii_media_status;
+ return ether_mediachange(ifp);
}
static uint8_t
@@ -1044,7 +1029,7 @@ mue_attach(device_t parent, device_t sel
mii->mii_flags = MIIF_AUTOTSLEEP;
sc->mue_ec.ec_mii = mii;
- ifmedia_init(&mii->mii_media, 0, mue_ifmedia_upd, mue_ifmedia_sts);
+ ifmedia_init(&mii->mii_media, 0, mue_ifmedia_upd, ether_mediastatus);
mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0);
if (LIST_FIRST(&mii->mii_phys) == NULL) {
Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.45 src/sys/dev/usb/if_smsc.c:1.46
--- src/sys/dev/usb/if_smsc.c:1.45 Thu May 23 13:10:52 2019
+++ src/sys/dev/usb/if_smsc.c Thu Aug 1 00:10:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.45 2019/05/23 13:10:52 msaitoh Exp $ */
+/* $NetBSD: if_smsc.c,v 1.46 2019/08/01 00:10:22 mrg Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.45 2019/05/23 13:10:52 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.46 2019/08/01 00:10:22 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -178,7 +178,6 @@ void smsc_miibus_statchg_locked(struct
int smsc_miibus_readreg(device_t, int, int, uint16_t *);
int smsc_miibus_writereg(device_t, int, int, uint16_t);
int smsc_ifmedia_upd(struct ifnet *);
-void smsc_ifmedia_sts(struct ifnet *, struct ifmediareq *);
void smsc_lock_mii(struct smsc_softc *);
void smsc_unlock_mii(struct smsc_softc *);
@@ -422,7 +421,6 @@ smsc_ifmedia_upd(struct ifnet *ifp)
{
struct smsc_softc * const sc = ifp->if_softc;
struct mii_data * const mii = &sc->sc_mii;
- int err;
if (mii->mii_instance) {
struct mii_softc *miisc;
@@ -430,24 +428,8 @@ smsc_ifmedia_upd(struct ifnet *ifp)
LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
mii_phy_reset(miisc);
}
- err = mii_mediachg(mii);
- return err;
-}
-
-void
-smsc_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
-{
- struct smsc_softc * const sc = ifp->if_softc;
- struct mii_data * const mii = &sc->sc_mii;
-
- /* SMSC_LOCK */
-
- mii_pollstat(mii);
-
- ifmr->ifm_active = mii->mii_media_active;
- ifmr->ifm_status = mii->mii_media_status;
- /* SMSC_UNLOCK */
+ return ether_mediachange(ifp);
}
static inline uint32_t
@@ -1215,7 +1197,7 @@ smsc_attach(device_t parent, device_t se
mii->mii_statchg = smsc_miibus_statchg;
mii->mii_flags = MIIF_AUTOTSLEEP;
sc->sc_ec.ec_mii = mii;
- ifmedia_init(&mii->mii_media, 0, smsc_ifmedia_upd, smsc_ifmedia_sts);
+ ifmedia_init(&mii->mii_media, 0, smsc_ifmedia_upd, ether_mediastatus);
mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0);
if (LIST_FIRST(&mii->mii_phys) == NULL) {
@@ -1625,7 +1607,6 @@ smsc_tx_list_init(struct smsc_softc *sc)
for (i = 0; i < SMSC_TX_LIST_CNT; i++) {
c = &cd->tx_chain[i];
c->sc_sc = sc;
- c->sc_idx = i;
c->sc_mbuf = NULL;
if (c->sc_xfer == NULL) {
int error = usbd_create_xfer(sc->sc_ep[SMSC_ENDPT_TX],
@@ -1669,7 +1650,6 @@ smsc_rx_list_init(struct smsc_softc *sc)
for (i = 0; i < SMSC_RX_LIST_CNT; i++) {
c = &cd->rx_chain[i];
c->sc_sc = sc;
- c->sc_idx = i;
c->sc_mbuf = NULL;
if (c->sc_xfer == NULL) {
int error = usbd_create_xfer(sc->sc_ep[SMSC_ENDPT_RX],
Index: src/sys/dev/usb/if_smscvar.h
diff -u src/sys/dev/usb/if_smscvar.h:1.7 src/sys/dev/usb/if_smscvar.h:1.8
--- src/sys/dev/usb/if_smscvar.h:1.7 Tue Jul 30 06:35:03 2019
+++ src/sys/dev/usb/if_smscvar.h Thu Aug 1 00:10:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smscvar.h,v 1.7 2019/07/30 06:35:03 skrll Exp $ */
+/* $NetBSD: if_smscvar.h,v 1.8 2019/08/01 00:10:22 mrg Exp $ */
/* $OpenBSD: if_smscreg.h,v 1.2 2012/09/27 12:38:11 jsg Exp $ */
/*-
@@ -39,8 +39,6 @@ struct smsc_chain {
struct usbd_xfer *sc_xfer;
char *sc_buf;
struct mbuf *sc_mbuf;
- int sc_accum;
- int sc_idx;
};
struct smsc_cdata {
Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.59 src/sys/dev/usb/if_udav.c:1.60
--- src/sys/dev/usb/if_udav.c:1.59 Tue May 28 07:41:50 2019
+++ src/sys/dev/usb/if_udav.c Thu Aug 1 00:10:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.59 2019/05/28 07:41:50 msaitoh Exp $ */
+/* $NetBSD: if_udav.c,v 1.60 2019/08/01 00:10:22 mrg Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.59 2019/05/28 07:41:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.60 2019/08/01 00:10:22 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -109,7 +109,6 @@ Static void udav_stop_task(struct udav_s
Static void udav_stop(struct ifnet *, int);
Static void udav_watchdog(struct ifnet *);
Static int udav_ifmedia_change(struct ifnet *);
-Static void udav_ifmedia_status(struct ifnet *, struct ifmediareq *);
Static void udav_lock_mii(struct udav_softc *);
Static void udav_unlock_mii(struct udav_softc *);
Static int udav_miibus_readreg(device_t, int, int, uint16_t *);
@@ -309,7 +308,7 @@ udav_attach(device_t parent, device_t se
mii->mii_flags = MIIF_AUTOTSLEEP;
sc->sc_ec.ec_mii = mii;
ifmedia_init(&mii->mii_media, 0,
- udav_ifmedia_change, udav_ifmedia_status);
+ udav_ifmedia_change, ether_mediastatus);
mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0);
if (LIST_FIRST(&mii->mii_phys) == NULL) {
ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL);
@@ -943,7 +942,6 @@ udav_rx_list_init(struct udav_softc *sc)
for (i = 0; i < UDAV_RX_LIST_CNT; i++) {
c = &cd->udav_rx_chain[i];
c->udav_sc = sc;
- c->udav_idx = i;
if (udav_newbuf(sc, c, NULL) == ENOBUFS)
return ENOBUFS;
if (c->udav_xfer == NULL) {
@@ -971,7 +969,6 @@ udav_tx_list_init(struct udav_softc *sc)
for (i = 0; i < UDAV_TX_LIST_CNT; i++) {
c = &cd->udav_tx_chain[i];
c->udav_sc = sc;
- c->udav_idx = i;
c->udav_mbuf = NULL;
if (c->udav_xfer == NULL) {
int error = usbd_create_xfer(sc->sc_pipe_tx, UDAV_BUFSZ,
@@ -1376,32 +1373,13 @@ Static int
udav_ifmedia_change(struct ifnet *ifp)
{
struct udav_softc *sc = ifp->if_softc;
- struct mii_data *mii = GET_MII(sc);
- int rc;
DPRINTF(("%s: %s: enter\n", device_xname(sc->sc_dev), __func__));
if (sc->sc_dying)
return 0;
- sc->sc_link = 0;
- if ((rc = mii_mediachg(mii)) == ENXIO)
- return 0;
- return rc;
-}
-
-/* Report current media status. */
-Static void
-udav_ifmedia_status(struct ifnet *ifp, struct ifmediareq *ifmr)
-{
- struct udav_softc *sc = ifp->if_softc;
-
- DPRINTF(("%s: %s: enter\n", device_xname(sc->sc_dev), __func__));
-
- if (sc->sc_dying)
- return;
-
- ether_mediastatus(ifp, ifmr);
+ return ether_mediachange(ifp);
}
Static void
Index: src/sys/dev/usb/if_udavreg.h
diff -u src/sys/dev/usb/if_udavreg.h:1.13 src/sys/dev/usb/if_udavreg.h:1.14
--- src/sys/dev/usb/if_udavreg.h:1.13 Sun Jul 21 10:27:56 2019
+++ src/sys/dev/usb/if_udavreg.h Thu Aug 1 00:10:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udavreg.h,v 1.13 2019/07/21 10:27:56 mrg Exp $ */
+/* $NetBSD: if_udavreg.h,v 1.14 2019/08/01 00:10:22 mrg Exp $ */
/* $nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $ */
/*
* Copyright (c) 2003
@@ -149,7 +149,6 @@ struct udav_chain {
struct usbd_xfer *udav_xfer;
char *udav_buf;
struct mbuf *udav_mbuf;
- int udav_idx;
};
struct udav_cdata {
Index: src/sys/dev/usb/if_url.c
diff -u src/sys/dev/usb/if_url.c:1.66 src/sys/dev/usb/if_url.c:1.67
--- src/sys/dev/usb/if_url.c:1.66 Sun Jul 21 10:27:56 2019
+++ src/sys/dev/usb/if_url.c Thu Aug 1 00:10:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_url.c,v 1.66 2019/07/21 10:27:56 mrg Exp $ */
+/* $NetBSD: if_url.c,v 1.67 2019/08/01 00:10:22 mrg Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.66 2019/07/21 10:27:56 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.67 2019/08/01 00:10:22 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -110,7 +110,6 @@ Static void url_stop_task(struct url_sof
Static void url_stop(struct ifnet *, int);
Static void url_watchdog(struct ifnet *);
Static int url_ifmedia_change(struct ifnet *);
-Static void url_ifmedia_status(struct ifnet *, struct ifmediareq *);
Static void url_lock_mii(struct url_softc *);
Static void url_unlock_mii(struct url_softc *);
Static int url_int_miibus_readreg(device_t, int, int, uint16_t *);
@@ -304,7 +303,7 @@ url_attach(device_t parent, device_t sel
mii->mii_flags = MIIF_AUTOTSLEEP;
sc->sc_ec.ec_mii = mii;
ifmedia_init(&mii->mii_media, 0,
- url_ifmedia_change, url_ifmedia_status);
+ url_ifmedia_change, ether_mediastatus);
mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0);
if (LIST_FIRST(&mii->mii_phys) == NULL) {
ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL);
@@ -1245,8 +1244,6 @@ Static int
url_ifmedia_change(struct ifnet *ifp)
{
struct url_softc *sc = ifp->if_softc;
- struct mii_data *mii = GET_MII(sc);
- int rc;
DPRINTF(("%s: %s: enter\n", device_xname(sc->sc_dev), __func__));
@@ -1254,23 +1251,8 @@ url_ifmedia_change(struct ifnet *ifp)
return 0;
sc->sc_link = 0;
- if ((rc = mii_mediachg(mii)) == ENXIO)
- return 0;
- return rc;
-}
-
-/* Report current media status. */
-Static void
-url_ifmedia_status(struct ifnet *ifp, struct ifmediareq *ifmr)
-{
- struct url_softc *sc = ifp->if_softc;
-
- DPRINTF(("%s: %s: enter\n", device_xname(sc->sc_dev), __func__));
-
- if (sc->sc_dying)
- return;
- ether_mediastatus(ifp, ifmr);
+ return ether_mediachange(ifp);
}
Static void
Index: src/sys/dev/usb/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.21 src/sys/dev/usb/if_urndis.c:1.22
--- src/sys/dev/usb/if_urndis.c:1.21 Tue Mar 5 08:25:03 2019
+++ src/sys/dev/usb/if_urndis.c Thu Aug 1 00:10:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urndis.c,v 1.21 2019/03/05 08:25:03 msaitoh Exp $ */
+/* $NetBSD: if_urndis.c,v 1.22 2019/08/01 00:10:22 mrg Exp $ */
/* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
/*
@@ -21,7 +21,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.21 2019/03/05 08:25:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.22 2019/08/01 00:10:22 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -66,7 +66,6 @@ struct urndis_chain {
struct usbd_xfer *sc_xfer;
char *sc_buf;
struct mbuf *sc_mbuf;
- int sc_idx;
};
struct urndis_cdata {
@@ -935,7 +934,6 @@ urndis_rx_list_init(struct urndis_softc
for (i = 0; i < RNDIS_RX_LIST_CNT; i++) {
c = &cd->sc_rx_chain[i];
c->sc_softc = sc;
- c->sc_idx = i;
if (urndis_newbuf(sc, c) == ENOBUFS)
return ENOBUFS;
@@ -963,7 +961,6 @@ urndis_tx_list_init(struct urndis_softc
for (i = 0; i < RNDIS_TX_LIST_CNT; i++) {
c = &cd->sc_tx_chain[i];
c->sc_softc = sc;
- c->sc_idx = i;
c->sc_mbuf = NULL;
if (c->sc_xfer == NULL) {
int err = usbd_create_xfer(sc->sc_bulkout_pipe,
