Module Name: src
Committed By: thorpej
Date: Tue Feb 4 05:18:36 UTC 2020
Modified Files:
src/sys/arch/mips/atheros/dev: if_ae.c
src/sys/arch/mips/ralink: ralink_eth.c
Log Message:
Use ifmedia_fini().
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/mips/atheros/dev/if_ae.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mips/ralink/ralink_eth.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/mips/atheros/dev/if_ae.c
diff -u src/sys/arch/mips/atheros/dev/if_ae.c:1.38 src/sys/arch/mips/atheros/dev/if_ae.c:1.39
--- src/sys/arch/mips/atheros/dev/if_ae.c:1.38 Wed Jan 29 05:30:14 2020
+++ src/sys/arch/mips/atheros/dev/if_ae.c Tue Feb 4 05:18:36 2020
@@ -1,4 +1,4 @@
-/* $Id: if_ae.c,v 1.38 2020/01/29 05:30:14 thorpej Exp $ */
+/* $Id: if_ae.c,v 1.39 2020/02/04 05:18:36 thorpej Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.38 2020/01/29 05:30:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.39 2020/02/04 05:18:36 thorpej Exp $");
#include <sys/param.h>
@@ -485,13 +485,13 @@ ae_detach(device_t self, int flags)
/* Detach all PHYs */
mii_detach(&sc->sc_mii, MII_PHY_ANY, MII_OFFSET_ANY);
- /* Delete all remaining media. */
- ifmedia_delete_instance(&sc->sc_mii.mii_media, IFM_INST_ANY);
-
rnd_detach_source(&sc->sc_rnd_source);
ether_ifdetach(ifp);
if_detach(ifp);
+ /* Delete all remaining media. */
+ ifmedia_fini(&sc->sc_mii.mii_media);
+
for (i = 0; i < AE_NRXDESC; i++) {
rxs = &sc->sc_rxsoft[i];
if (rxs->rxs_mbuf != NULL) {
Index: src/sys/arch/mips/ralink/ralink_eth.c
diff -u src/sys/arch/mips/ralink/ralink_eth.c:1.20 src/sys/arch/mips/ralink/ralink_eth.c:1.21
--- src/sys/arch/mips/ralink/ralink_eth.c:1.20 Wed Jan 29 05:30:14 2020
+++ src/sys/arch/mips/ralink/ralink_eth.c Tue Feb 4 05:18:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_eth.c,v 1.20 2020/01/29 05:30:14 thorpej Exp $ */
+/* $NetBSD: ralink_eth.c,v 1.21 2020/02/04 05:18:36 thorpej Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
/* ralink_eth.c -- Ralink Ethernet Driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.20 2020/01/29 05:30:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.21 2020/02/04 05:18:36 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -656,9 +656,9 @@ ralink_eth_detach(device_t self, int fla
ralink_eth_disable(sc);
mii_detach(&sc->sc_mii, MII_PHY_ANY, MII_OFFSET_ANY);
- ifmedia_delete_instance(&sc->sc_mii.mii_media, IFM_INST_ANY);
ether_ifdetach(ifp);
if_detach(ifp);
+ ifmedia_fini(&sc->sc_mii.mii_media);
for (i = 0; i < RALINK_ETH_NUM_RX_DESC; i++) {
rxs = &sc->sc_rxstate[i];
