svn commit: r339735 - in stable/12: share/man/man4 share/man/man4/man4.i386 share/man/man4/man4.powerpc sys/dev/ae sys/dev/bm sys/dev/cs sys/dev/de sys/dev/dme sys/dev/ed sys/dev/ep sys/dev/ex sys/...

Brooks Davis brooks at FreeBSD.org
Thu Oct 25 17:00:48 UTC 2018


Author: brooks
Date: Thu Oct 25 17:00:39 2018
New Revision: 339735
URL: https://svnweb.freebsd.org/changeset/base/339735

Log:
  MFC r339703:
  
  Deprecate a number of less used 10 and 10/100 Ethernet devices.
  
  The current deprecated list is: ae, bm, cs, de, dme, ed, ep, ex, fe,
  pcn, sf, sn, tl, tx, txp, vx, wb, xe
  
  The list was defined as part of FCP-0101. Per the FCP, devices may be
  removed from the deprecation list if enough users are found or they are
  converted to iflib.
  
  FCP:		https://github.com/freebsd/fcp/blob/master/fcp-0101.md
  Approved by:	re (gjb)
  Reviewed by:	rgrimes
  Differential Revision:	https://reviews.freebsd.org/D17654

Modified:
  stable/12/share/man/man4/ae.4
  stable/12/share/man/man4/de.4
  stable/12/share/man/man4/ed.4
  stable/12/share/man/man4/man4.i386/cs.4
  stable/12/share/man/man4/man4.i386/ep.4
  stable/12/share/man/man4/man4.i386/ex.4
  stable/12/share/man/man4/man4.i386/fe.4
  stable/12/share/man/man4/man4.i386/vx.4
  stable/12/share/man/man4/man4.powerpc/bm.4
  stable/12/share/man/man4/pcn.4
  stable/12/share/man/man4/sf.4
  stable/12/share/man/man4/sn.4
  stable/12/share/man/man4/tl.4
  stable/12/share/man/man4/tx.4
  stable/12/share/man/man4/txp.4
  stable/12/share/man/man4/wb.4
  stable/12/share/man/man4/xe.4
  stable/12/sys/dev/ae/if_ae.c
  stable/12/sys/dev/bm/if_bm.c
  stable/12/sys/dev/cs/if_cs.c
  stable/12/sys/dev/de/if_de.c
  stable/12/sys/dev/dme/if_dme.c
  stable/12/sys/dev/ed/if_ed.c
  stable/12/sys/dev/ep/if_ep.c
  stable/12/sys/dev/ex/if_ex.c
  stable/12/sys/dev/fe/if_fe.c
  stable/12/sys/dev/pcn/if_pcn.c
  stable/12/sys/dev/sf/if_sf.c
  stable/12/sys/dev/sn/if_sn.c
  stable/12/sys/dev/tl/if_tl.c
  stable/12/sys/dev/tx/if_tx.c
  stable/12/sys/dev/txp/if_txp.c
  stable/12/sys/dev/vx/if_vx.c
  stable/12/sys/dev/wb/if_wb.c
  stable/12/sys/dev/xe/if_xe.c
  stable/12/sys/sys/systm.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/share/man/man4/ae.4
==============================================================================
--- stable/12/share/man/man4/ae.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/ae.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 4, 2008
+.Dd October 24, 2018
 .Dt AE 4
 .Os
 .Sh NAME
@@ -44,6 +44,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_ae_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/de.4
==============================================================================
--- stable/12/share/man/man4/de.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/de.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 16, 2005
+.Dd October 24, 2018
 .Dt DE 4
 .Os
 .Sh NAME
@@ -45,6 +45,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_de_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/ed.4
==============================================================================
--- stable/12/share/man/man4/ed.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/ed.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 25, 2012
+.Dd October 24, 2018
 .Dt ED 4
 .Os
 .Sh NAME
@@ -51,6 +51,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_ed_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/man4.i386/cs.4
==============================================================================
--- stable/12/share/man/man4/man4.i386/cs.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/man4.i386/cs.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 16, 2005
+.Dd October 24 2018
 .Dt CS 4 i386
 .Os
 .Sh NAME
@@ -52,6 +52,14 @@ In
 .Cd hint.cs.0.port="0x300"
 .Cd hint.cs.0.irq="10"
 .Cd hint.cs.0.maddr="0xd000"
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/man4.i386/ep.4
==============================================================================
--- stable/12/share/man/man4/man4.i386/ep.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/man4.i386/ep.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 1, 2011
+.Dd October 24, 2018
 .Dt EP 4 i386
 .Os
 .Sh NAME
@@ -49,6 +49,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_ep_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/man4.i386/ex.4
==============================================================================
--- stable/12/share/man/man4/man4.i386/ex.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/man4.i386/ex.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 16, 2005
+.Dd October 24, 2018
 .Dt EX 4 i386
 .Os
 .Sh NAME
@@ -45,6 +45,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_ex_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/man4.i386/fe.4
==============================================================================
--- stable/12/share/man/man4/man4.i386/fe.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/man4.i386/fe.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -22,7 +22,7 @@
 .\" for fe driver.
 .\"
 .\" $FreeBSD$
-.Dd July 16, 2005
+.Dd October 24, 2018
 .Dt FE 4 i386
 .Os
 .Sh NAME
@@ -48,6 +48,14 @@ In
 .Cd hint.fe.0.at="isa"
 .Cd hint.fe.0.port="0x300"
 .Cd hint.fe.0.flags="0x0"
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/man4.i386/vx.4
==============================================================================
--- stable/12/share/man/man4/man4.i386/vx.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/man4.i386/vx.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 15, 2017
+.Dd October 24, 2018
 .Dt VX 4 i386
 .Os
 .Sh NAME
@@ -50,6 +50,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_vx_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/man4.powerpc/bm.4
==============================================================================
--- stable/12/share/man/man4/man4.powerpc/bm.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/man4.powerpc/bm.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 3, 2008
+.Dd October 24, 2018
 .Dt BM 4
 .Os
 .Sh NAME
@@ -46,6 +46,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_bm_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/pcn.4
==============================================================================
--- stable/12/share/man/man4/pcn.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/pcn.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -31,7 +31,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 31, 2006
+.Dd October 24, 2018
 .Dt PCN 4
 .Os
 .Sh NAME
@@ -52,6 +52,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_pcn_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/sf.4
==============================================================================
--- stable/12/share/man/man4/sf.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/sf.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 21, 2008
+.Dd October 24, 2018
 .Dt SF 4
 .Os
 .Sh NAME
@@ -53,6 +53,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_sf_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/sn.4
==============================================================================
--- stable/12/share/man/man4/sn.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/sn.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 16, 2005
+.Dd October 24, 2018
 .Dt SN 4
 .Os
 .Sh NAME
@@ -43,6 +43,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_sn_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/tl.4
==============================================================================
--- stable/12/share/man/man4/tl.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/tl.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 16, 2005
+.Dd October 24, 2018
 .Dt TL 4
 .Os
 .Sh NAME
@@ -51,6 +51,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_tl_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/tx.4
==============================================================================
--- stable/12/share/man/man4/tx.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/tx.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 16, 2005
+.Dd October 24, 2018
 .Dt TX 4
 .Os
 .Sh NAME
@@ -46,6 +46,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_tx_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/txp.4
==============================================================================
--- stable/12/share/man/man4/txp.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/txp.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 26, 2012
+.Dd October 24, 2018
 .Dt TXP 4
 .Os
 .Sh NAME
@@ -46,6 +46,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_txp_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/wb.4
==============================================================================
--- stable/12/share/man/man4/wb.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/wb.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 16, 2005
+.Dd October 24, 2018
 .Dt WB 4
 .Os
 .Sh NAME
@@ -51,6 +51,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_wb_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/share/man/man4/xe.4
==============================================================================
--- stable/12/share/man/man4/xe.4	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/share/man/man4/xe.4	Thu Oct 25 17:00:39 2018	(r339735)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 16, 2005
+.Dd October 24 2018
 .Dt XE 4
 .Os
 .Sh NAME
@@ -45,6 +45,14 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_xe_load="YES"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 13.0
+and later.
+See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more
+information.
 .Sh DESCRIPTION
 The
 .Nm

Modified: stable/12/sys/dev/ae/if_ae.c
==============================================================================
--- stable/12/sys/dev/ae/if_ae.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/ae/if_ae.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -396,6 +396,8 @@ ae_attach(device_t dev)
 		goto fail;
 	}
 
+	gone_by_fcp101_dev(dev);
+
 fail:
 	if (error != 0)
 		ae_detach(dev);

Modified: stable/12/sys/dev/bm/if_bm.c
==============================================================================
--- stable/12/sys/dev/bm/if_bm.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/bm/if_bm.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -483,6 +483,8 @@ bm_attach(device_t dev)
 	ether_ifattach(ifp, sc->sc_enaddr);
 	ifp->if_hwassist = 0;
 
+	gone_by_fcp101_dev(dev);
+
 	return (0);
 }
 

Modified: stable/12/sys/dev/cs/if_cs.c
==============================================================================
--- stable/12/sys/dev/cs/if_cs.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/cs/if_cs.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -574,6 +574,8 @@ cs_attach(device_t dev)
 		return (error);
 	}
 
+	gone_by_fcp101_dev(dev);
+
 	return (0);
 }
 

Modified: stable/12/sys/dev/de/if_de.c
==============================================================================
--- stable/12/sys/dev/de/if_de.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/de/if_de.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -4432,6 +4432,8 @@ tulip_attach(tulip_softc_t * const sc)
     TULIP_LOCK(sc);
     sc->tulip_flags &= ~TULIP_DEVICEPROBE;
     TULIP_UNLOCK(sc);
+
+    gone_by_fcp101_dev(sc->tulip_dev);
 }
 
 /* Release memory for a single descriptor ring. */

Modified: stable/12/sys/dev/dme/if_dme.c
==============================================================================
--- stable/12/sys/dev/dme/if_dme.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/dme/if_dme.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -915,6 +915,9 @@ dme_attach(device_t dev)
 		ether_ifdetach(ifp);
 		goto fail;
 	}
+
+	gone_by_fcp101_dev(dev);
+
 fail:
 	if (error != 0)
 		dme_detach(dev);

Modified: stable/12/sys/dev/ed/if_ed.c
==============================================================================
--- stable/12/sys/dev/ed/if_ed.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/ed/if_ed.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -365,6 +365,9 @@ ed_attach(device_t dev)
 #endif
 		printf("\n");
 	}
+
+	gone_by_fcp101_dev(dev);
+
 	return (0);
 }
 

Modified: stable/12/sys/dev/ep/if_ep.c
==============================================================================
--- stable/12/sys/dev/ep/if_ep.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/ep/if_ep.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -350,6 +350,8 @@ ep_attach(struct ep_softc *sc)
 	epstop(sc);
 	EP_UNLOCK(sc);
 
+	gone_by_fcp101_dev(sc->dev);
+
 	return (0);
 }
 

Modified: stable/12/sys/dev/ex/if_ex.c
==============================================================================
--- stable/12/sys/dev/ex/if_ex.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/ex/if_ex.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -276,6 +276,8 @@ ex_attach(device_t dev)
 		return (error);
 	}
 
+	gone_by_fcp101_dev(dev);
+
 	return(0);
 }
 

Modified: stable/12/sys/dev/fe/if_fe.c
==============================================================================
--- stable/12/sys/dev/fe/if_fe.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/fe/if_fe.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -861,6 +861,8 @@ fe_attach (device_t dev)
 	if (sc->stability & UNSTABLE_TYPE)
 		device_printf(dev, "warning: hardware type was not validated\n");
 
+	gone_by_fcp101_dev(dev);
+
 	return 0;
 }
 

Modified: stable/12/sys/dev/pcn/if_pcn.c
==============================================================================
--- stable/12/sys/dev/pcn/if_pcn.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/pcn/if_pcn.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -684,6 +684,8 @@ fail:
 	if (error)
 		pcn_detach(dev);
 
+	gone_by_fcp101_dev(dev);
+
 	return(error);
 }
 

Modified: stable/12/sys/dev/sf/if_sf.c
==============================================================================
--- stable/12/sys/dev/sf/if_sf.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/sf/if_sf.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -917,6 +917,8 @@ sf_attach(device_t dev)
 		goto fail;
 	}
 
+	gone_by_fcp101_dev(dev);
+
 fail:
 	if (error)
 		sf_detach(dev);

Modified: stable/12/sys/dev/sn/if_sn.c
==============================================================================
--- stable/12/sys/dev/sn/if_sn.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/sn/if_sn.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -227,6 +227,9 @@ sn_attach(device_t dev)
 		sn_detach(dev);
 		return err;
 	}
+
+	gone_by_fcp101_dev(dev);
+
 	return 0;
 }
 

Modified: stable/12/sys/dev/tl/if_tl.c
==============================================================================
--- stable/12/sys/dev/tl/if_tl.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/tl/if_tl.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -1242,6 +1242,8 @@ tl_attach(dev)
 		goto fail;
 	}
 
+	gone_by_fcp101_dev(dev);
+
 fail:
 	if (error)
 		tl_detach(dev);

Modified: stable/12/sys/dev/tx/if_tx.c
==============================================================================
--- stable/12/sys/dev/tx/if_tx.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/tx/if_tx.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -428,6 +428,8 @@ epic_attach(device_t dev)
 		goto fail;
 	}
 
+	gone_by_fcp101_dev(dev);
+
 	return (0);
 fail:
 	epic_release(sc);

Modified: stable/12/sys/dev/txp/if_txp.c
==============================================================================
--- stable/12/sys/dev/txp/if_txp.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/txp/if_txp.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -472,6 +472,8 @@ txp_attach(device_t dev)
 		goto fail;
 	}
 
+	gone_by_fcp101_dev(dev);
+
 	return (0);
 
 fail:

Modified: stable/12/sys/dev/vx/if_vx.c
==============================================================================
--- stable/12/sys/dev/vx/if_vx.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/vx/if_vx.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -206,6 +206,8 @@ vx_attach(device_t dev)
 	vx_stop(sc);
 	VX_UNLOCK(sc);
 
+	gone_by_fcp101_dev(dev);
+
 	return 1;
 }
 

Modified: stable/12/sys/dev/wb/if_wb.c
==============================================================================
--- stable/12/sys/dev/wb/if_wb.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/wb/if_wb.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -694,6 +694,8 @@ wb_attach(dev)
 		goto fail;
 	}
 
+	gone_by_fcp101_dev(dev);
+
 fail:
 	if (error)
 		wb_detach(dev);

Modified: stable/12/sys/dev/xe/if_xe.c
==============================================================================
--- stable/12/sys/dev/xe/if_xe.c	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/dev/xe/if_xe.c	Thu Oct 25 17:00:39 2018	(r339735)
@@ -317,6 +317,8 @@ xe_attach(device_t dev)
 		return (err);
 	}
 
+	gone_by_fcp101_dev(dev);
+
 	/* Done */
 	return (0);
 }

Modified: stable/12/sys/sys/systm.h
==============================================================================
--- stable/12/sys/sys/systm.h	Thu Oct 25 16:01:19 2018	(r339734)
+++ stable/12/sys/sys/systm.h	Thu Oct 25 17:00:39 2018	(r339735)
@@ -543,6 +543,9 @@ void _gone_in_dev(struct device *dev, int major, const
 #endif
 #define gone_in(major, msg)		__gone_ok(major, msg) _gone_in(major, msg)
 #define gone_in_dev(dev, major, msg)	__gone_ok(major, msg) _gone_in_dev(dev, major, msg)
+#define	gone_by_fcp101_dev(dev)						\
+	gone_in_dev((dev), 13,						\
+	    "see https://github.com/freebsd/fcp/blob/master/fcp-0101.md")
 
 __NULLABILITY_PRAGMA_POP
 


More information about the svn-src-all mailing list