svn commit: r368646 - in stable/12: share/man/man4 sys/dev/if_ndis

[Brooks Davis]

Author: brooks
Date: Mon Dec 14 22:07:07 2020
New Revision: 368646
URL: https://svnweb.freebsd.org/changeset/base/368646

Log:
  MFC r368561:
  
  ndis(4): expand deprecation to the whole driver
  
  nids(4) was a clever idea in the early 2000's when the market was
  flooded with 10/100 NICs with Windows-only drivers, but that hasn't been
  the case for ages and the driver has had no meaningful maintenance in
  ages. It only supports Windows-XP era drivers.
  
  Reviewed by:	imp, bcr
  Sponsored by:	DARPA
  Differential Revision:	https://reviews.freebsd.org/D27527

Modified:
  stable/12/share/man/man4/ndis.4
  stable/12/sys/dev/if_ndis/if_ndis_pccard.c
  stable/12/sys/dev/if_ndis/if_ndis_pci.c
  stable/12/sys/dev/if_ndis/if_ndis_usb.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/share/man/man4/ndis.4
==============================================================================
--- stable/12/share/man/man4/ndis.4	Mon Dec 14 22:03:13 2020	(r368645)
+++ stable/12/share/man/man4/ndis.4	Mon Dec 14 22:07:07 2020	(r368646)
@@ -121,7 +121,7 @@ which can be configured via the
 .Xr sysctl 8
 command.
 .Sh DEPRECATION NOTICE
-The PC Card attachment of this driver is scheduled for removal prior to the release of
+This driver is scheduled for removal prior to the release of
 .Fx 13.0
 .Sh DIAGNOSTICS
 .Bl -diag

Modified: stable/12/sys/dev/if_ndis/if_ndis_pccard.c
==============================================================================
--- stable/12/sys/dev/if_ndis/if_ndis_pccard.c	Mon Dec 14 22:03:13 2020	(r368645)
+++ stable/12/sys/dev/if_ndis/if_ndis_pccard.c	Mon Dec 14 22:07:07 2020	(r368646)
@@ -304,7 +304,7 @@ ndis_attach_pccard(dev)
 
 	error = ndis_attach(dev);
 	if (error == 0)
-		gone_in_dev(dev, 13, "pccard removed");
+		gone_in_dev(dev, 13, "ndis removed");
 
 fail:
 	return(error);

Modified: stable/12/sys/dev/if_ndis/if_ndis_pci.c
==============================================================================
--- stable/12/sys/dev/if_ndis/if_ndis_pci.c	Mon Dec 14 22:03:13 2020	(r368645)
+++ stable/12/sys/dev/if_ndis/if_ndis_pci.c	Mon Dec 14 22:07:07 2020	(r368646)
@@ -337,6 +337,9 @@ ndis_attach_pci(dev)
 		sc->ndis_devidx = devidx;
 
 	error = ndis_attach(dev);
+	if (error == 0)
+		gone_in_dev(dev, 13, "ndis removed");
+
 
 fail:
 	return(error);

Modified: stable/12/sys/dev/if_ndis/if_ndis_usb.c
==============================================================================
--- stable/12/sys/dev/if_ndis/if_ndis_usb.c	Mon Dec 14 22:03:13 2020	(r368645)
+++ stable/12/sys/dev/if_ndis/if_ndis_usb.c	Mon Dec 14 22:07:07 2020	(r368646)
@@ -198,6 +198,8 @@ ndisusb_attach(device_t self)
 	if (ndis_attach(self) != 0)
 		return (ENXIO);
 
+	gone_in_dev(self, 13, "ndis removed");
+
 	return (0);
 }