svn commit: r347848 - in stable/12/sys/dev: ae dme

[Brooks Davis]

Author: brooks
Date: Thu May 16 18:00:17 2019
New Revision: 347848
URL: https://svnweb.freebsd.org/changeset/base/347848

Log:
  MFC r347365, r347703
  
  r347365:
  Update dme(4) to reflect that it will not be removed due to FCP-101.
  
  dme(4) is the built-in NIC on a couple non-expandable mips platforms and
  thus should remain.  The FCP has been updated to reflect this fact.
  
  Discussed with:	imp
  
  r347703:
  FCP-101: ae(4) is sufficently popular to be moved to the keep list.

Modified:
  stable/12/sys/dev/ae/if_ae.c
  stable/12/sys/dev/dme/if_dme.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/ae/if_ae.c
==============================================================================
--- stable/12/sys/dev/ae/if_ae.c	Thu May 16 17:59:43 2019	(r347847)
+++ stable/12/sys/dev/ae/if_ae.c	Thu May 16 18:00:17 2019	(r347848)
@@ -396,8 +396,6 @@ ae_attach(device_t dev)
 		goto fail;
 	}
 
-	gone_by_fcp101_dev(dev);
-
 fail:
 	if (error != 0)
 		ae_detach(dev);

Modified: stable/12/sys/dev/dme/if_dme.c
==============================================================================
--- stable/12/sys/dev/dme/if_dme.c	Thu May 16 17:59:43 2019	(r347847)
+++ stable/12/sys/dev/dme/if_dme.c	Thu May 16 18:00:17 2019	(r347848)
@@ -916,8 +916,6 @@ dme_attach(device_t dev)
 		goto fail;
 	}
 
-	gone_by_fcp101_dev(dev);
-
 fail:
 	if (error != 0)
 		dme_detach(dev);