Module Name: src
Committed By: thorpej
Date: Tue Feb 4 05:15:45 UTC 2020
Modified Files:
src/sys/arch/arm/omap: if_cpsw.c
src/sys/arch/arm/ti: if_cpsw.c
Log Message:
Use ifmedia_fini().
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/omap/if_cpsw.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/ti/if_cpsw.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/omap/if_cpsw.c
diff -u src/sys/arch/arm/omap/if_cpsw.c:1.26 src/sys/arch/arm/omap/if_cpsw.c:1.27
--- src/sys/arch/arm/omap/if_cpsw.c:1.26 Mon Jan 6 06:50:00 2020
+++ src/sys/arch/arm/omap/if_cpsw.c Tue Feb 4 05:15:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cpsw.c,v 1.26 2020/01/06 06:50:00 msaitoh Exp $ */
+/* $NetBSD: if_cpsw.c,v 1.27 2020/02/04 05:15:44 thorpej Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.26 2020/01/06 06:50:00 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.27 2020/02/04 05:15:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -362,12 +362,12 @@ cpsw_detach(device_t self, int flags)
intr_disestablish(sc->sc_txih);
intr_disestablish(sc->sc_miscih);
- /* Delete all media. */
- ifmedia_delete_instance(&sc->sc_mii.mii_media, IFM_INST_ANY);
-
ether_ifdetach(ifp);
if_detach(ifp);
+ /* Delete all media. */
+ ifmedia_fini(&sc->sc_mii.mii_media);
+
/* Free the packet padding buffer */
kmem_free(sc->sc_txpad, ETHER_MIN_LEN);
bus_dmamap_destroy(sc->sc_bdt, sc->sc_txpad_dm);
Index: src/sys/arch/arm/ti/if_cpsw.c
diff -u src/sys/arch/arm/ti/if_cpsw.c:1.11 src/sys/arch/arm/ti/if_cpsw.c:1.12
--- src/sys/arch/arm/ti/if_cpsw.c:1.11 Wed Jan 29 06:05:31 2020
+++ src/sys/arch/arm/ti/if_cpsw.c Tue Feb 4 05:15:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cpsw.c,v 1.11 2020/01/29 06:05:31 thorpej Exp $ */
+/* $NetBSD: if_cpsw.c,v 1.12 2020/02/04 05:15:45 thorpej Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.11 2020/01/29 06:05:31 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.12 2020/02/04 05:15:45 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -361,12 +361,12 @@ cpsw_detach(device_t self, int flags)
intr_disestablish(sc->sc_txih);
intr_disestablish(sc->sc_miscih);
- /* Delete all media. */
- ifmedia_delete_instance(&sc->sc_mii.mii_media, IFM_INST_ANY);
-
ether_ifdetach(ifp);
if_detach(ifp);
+ /* Delete all media. */
+ ifmedia_fini(&sc->sc_mii.mii_media);
+
/* Free the packet padding buffer */
kmem_free(sc->sc_txpad, ETHER_MIN_LEN);
bus_dmamap_destroy(sc->sc_bdt, sc->sc_txpad_dm);
