aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2020-12-14 22:07:07 +0000
committerBrooks Davis <brooks@FreeBSD.org>2020-12-14 22:07:07 +0000
commit103a5e30fa98f5750b54ba1277d2f8af391539a7 (patch)
treedf499b85656511a91d5b416fe7092e4dbc11beb0
parent70fe0fdb6067c0691bcc1aea8a59268149f9fbe3 (diff)
downloadsrc-103a5e30fa98f5750b54ba1277d2f8af391539a7.tar.gz
src-103a5e30fa98f5750b54ba1277d2f8af391539a7.zip
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
Notes
Notes: svn path=/stable/12/; revision=368646
-rw-r--r--share/man/man4/ndis.42
-rw-r--r--sys/dev/if_ndis/if_ndis_pccard.c2
-rw-r--r--sys/dev/if_ndis/if_ndis_pci.c3
-rw-r--r--sys/dev/if_ndis/if_ndis_usb.c2
4 files changed, 7 insertions, 2 deletions
diff --git a/share/man/man4/ndis.4 b/share/man/man4/ndis.4
index 1531b0ced897..4f0b0ab2ed22 100644
--- a/share/man/man4/ndis.4
+++ b/share/man/man4/ndis.4
@@ -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
diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index aa9735eba1ea..85b23a18d11a 100644
--- a/sys/dev/if_ndis/if_ndis_pccard.c
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -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);
diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
index b9d860f9d889..ba83652d1289 100644
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ b/sys/dev/if_ndis/if_ndis_pci.c
@@ -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);
diff --git a/sys/dev/if_ndis/if_ndis_usb.c b/sys/dev/if_ndis/if_ndis_usb.c
index d88dc59c1968..40fa32c4b93e 100644
--- a/sys/dev/if_ndis/if_ndis_usb.c
+++ b/sys/dev/if_ndis/if_ndis_usb.c
@@ -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);
}