Module Name: src
Committed By: thorpej
Date: Tue Feb 4 05:46:32 UTC 2020
Modified Files:
src/sys/dev/pcmcia: if_ray.c
src/sys/dev/usb: if_umb.c usbnet.c
src/sys/net: if_spppsubr.c if_tap.c
src/sys/net80211: ieee80211.c
src/sys/netinet: ip_carp.c
Log Message:
Use ifmedia_fini().
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/pcmcia/if_ray.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/if_umb.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/usb/usbnet.c
cvs rdiff -u -r1.185 -r1.186 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.116 -r1.117 src/sys/net/if_tap.c
cvs rdiff -u -r1.57 -r1.58 src/sys/net80211/ieee80211.c
cvs rdiff -u -r1.108 -r1.109 src/sys/netinet/ip_carp.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/pcmcia/if_ray.c
diff -u src/sys/dev/pcmcia/if_ray.c:1.97 src/sys/dev/pcmcia/if_ray.c:1.98
--- src/sys/dev/pcmcia/if_ray.c:1.97 Wed Jan 29 13:54:41 2020
+++ src/sys/dev/pcmcia/if_ray.c Tue Feb 4 05:46:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ray.c,v 1.97 2020/01/29 13:54:41 thorpej Exp $ */
+/* $NetBSD: if_ray.c,v 1.98 2020/02/04 05:46:32 thorpej Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.97 2020/01/29 13:54:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.98 2020/02/04 05:46:32 thorpej Exp $");
#include "opt_inet.h"
@@ -642,9 +642,9 @@ ray_detach(device_t self, int flags)
if (sc->sc_if.if_flags & IFF_UP)
ray_disable(sc);
- ifmedia_delete_instance(&sc->sc_media, IFM_INST_ANY);
ether_ifdetach(ifp);
if_detach(ifp);
+ ifmedia_fini(&sc->sc_media);
pcmcia_function_unconfigure(sc->sc_pf);
Index: src/sys/dev/usb/if_umb.c
diff -u src/sys/dev/usb/if_umb.c:1.11 src/sys/dev/usb/if_umb.c:1.12
--- src/sys/dev/usb/if_umb.c:1.11 Wed Jan 29 06:35:28 2020
+++ src/sys/dev/usb/if_umb.c Tue Feb 4 05:46:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_umb.c,v 1.11 2020/01/29 06:35:28 thorpej Exp $ */
+/* $NetBSD: if_umb.c,v 1.12 2020/02/04 05:46:32 thorpej Exp $ */
/* $OpenBSD: if_umb.c,v 1.20 2018/09/10 17:00:45 gerhard Exp $ */
/*
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_umb.c,v 1.11 2020/01/29 06:35:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_umb.c,v 1.12 2020/02/04 05:46:32 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -601,7 +601,7 @@ umb_detach(device_t self, int flags)
sc->sc_resp_buf = NULL;
}
if (ifp->if_softc) {
- ifmedia_delete_instance(&sc->sc_im, IFM_INST_ANY);
+ ifmedia_fini(&sc->sc_im);
}
if (sc->sc_attached) {
rnd_detach_source(&sc->sc_rnd_source);
Index: src/sys/dev/usb/usbnet.c
diff -u src/sys/dev/usb/usbnet.c:1.34 src/sys/dev/usb/usbnet.c:1.35
--- src/sys/dev/usb/usbnet.c:1.34 Wed Jan 29 06:39:07 2020
+++ src/sys/dev/usb/usbnet.c Tue Feb 4 05:46:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.c,v 1.34 2020/01/29 06:39:07 thorpej Exp $ */
+/* $NetBSD: usbnet.c,v 1.35 2020/02/04 05:46:32 thorpej Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.34 2020/01/29 06:39:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.35 2020/02/04 05:46:32 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1534,7 +1534,7 @@ usbnet_detach(device_t self, int flags)
if (mii) {
mii_detach(mii, MII_PHY_ANY, MII_OFFSET_ANY);
- ifmedia_delete_instance(&mii->mii_media, IFM_INST_ANY);
+ ifmedia_fini(&mii->mii_media);
}
if (ifp->if_softc) {
if (!usbnet_empty_eaddr(un))
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.185 src/sys/net/if_spppsubr.c:1.186
--- src/sys/net/if_spppsubr.c:1.185 Wed Jan 29 04:28:27 2020
+++ src/sys/net/if_spppsubr.c Tue Feb 4 05:46:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.185 2020/01/29 04:28:27 thorpej Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.186 2020/02/04 05:46:32 thorpej Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.185 2020/01/29 04:28:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.186 2020/02/04 05:46:32 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -1094,8 +1094,7 @@ sppp_detach(struct ifnet *ifp)
SPPP_UNLOCK(sp);
rw_destroy(&sp->pp_lock);
- /* Safety - shouldn't be needed as there is no media to set. */
- ifmedia_delete_instance(&sp->pp_im, IFM_INST_ANY);
+ ifmedia_fini(&sp->pp_im);
}
/*
Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.116 src/sys/net/if_tap.c:1.117
--- src/sys/net/if_tap.c:1.116 Wed Jan 29 04:28:27 2020
+++ src/sys/net/if_tap.c Tue Feb 4 05:46:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tap.c,v 1.116 2020/01/29 04:28:27 thorpej Exp $ */
+/* $NetBSD: if_tap.c,v 1.117 2020/02/04 05:46:32 thorpej Exp $ */
/*
* Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.116 2020/01/29 04:28:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.117 2020/02/04 05:46:32 thorpej Exp $");
#if defined(_KERNEL_OPT)
@@ -451,7 +451,7 @@ tap_detach(device_t self, int flags)
"sysctl_destroyv returned %d, ignoring\n", error);
ether_ifdetach(ifp);
if_detach(ifp);
- ifmedia_removeall(&sc->sc_im);
+ ifmedia_fini(&sc->sc_im);
seldestroy(&sc->sc_rsel);
mutex_destroy(&sc->sc_lock);
cv_destroy(&sc->sc_cv);
Index: src/sys/net80211/ieee80211.c
diff -u src/sys/net80211/ieee80211.c:1.57 src/sys/net80211/ieee80211.c:1.58
--- src/sys/net80211/ieee80211.c:1.57 Thu Oct 3 17:46:56 2019
+++ src/sys/net80211/ieee80211.c Tue Feb 4 05:46:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211.c,v 1.57 2019/10/03 17:46:56 jmcneill Exp $ */
+/* $NetBSD: ieee80211.c,v 1.58 2020/02/04 05:46:32 thorpej Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.22 2005/08/10 16:22:29 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211.c,v 1.57 2019/10/03 17:46:56 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211.c,v 1.58 2020/02/04 05:46:32 thorpej Exp $");
#endif
/*
@@ -260,7 +260,7 @@ ieee80211_ifdetach(struct ieee80211com *
ieee80211_crypto_detach(ic);
ieee80211_node_detach(ic);
LIST_REMOVE(ic, ic_list);
- ifmedia_delete_instance(&ic->ic_media, IFM_INST_ANY);
+ ifmedia_fini(&ic->ic_media);
IEEE80211_BEACON_LOCK_DESTROY(ic);
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.108 src/sys/netinet/ip_carp.c:1.109
--- src/sys/netinet/ip_carp.c:1.108 Wed Jan 29 04:37:24 2020
+++ src/sys/netinet/ip_carp.c Tue Feb 4 05:46:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.108 2020/01/29 04:37:24 thorpej Exp $ */
+/* $NetBSD: ip_carp.c,v 1.109 2020/02/04 05:46:32 thorpej Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -33,7 +33,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.108 2020/01/29 04:37:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.109 2020/02/04 05:46:32 thorpej Exp $");
/*
* TODO:
@@ -907,10 +907,10 @@ carp_clone_destroy(struct ifnet *ifp)
{
struct carp_softc *sc = ifp->if_softc;
- ifmedia_delete_instance(&sc->sc_im, IFM_INST_ANY);
carpdetach(ifp->if_softc);
ether_ifdetach(ifp);
if_detach(ifp);
+ ifmedia_fini(&sc->sc_im);
callout_destroy(&sc->sc_ad_tmo);
callout_destroy(&sc->sc_md_tmo);
callout_destroy(&sc->sc_md6_tmo);
