summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2020-12-14 22:53:19 +0000
committerBrooks Davis <brooks@FreeBSD.org>2020-12-14 22:53:19 +0000
commit8dbcd6469db7d17f42c50dba4dab7739b8a49e5c (patch)
treeb37c9b0367c8db3bbb67120327990af2f72487e9
parent725687af3c29b3df2f887cdd3e48617c027dd92d (diff)
downloadsrc-test2-8dbcd6469db7d17f42c50dba4dab7739b8a49e5c.tar.gz
src-test2-8dbcd6469db7d17f42c50dba4dab7739b8a49e5c.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/11/; revision=368650
-rw-r--r--share/man/man4/ndis.43
-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, 10 insertions, 0 deletions
diff --git a/share/man/man4/ndis.4 b/share/man/man4/ndis.4
index 5e1c29485ff3..4f0b0ab2ed22 100644
--- a/share/man/man4/ndis.4
+++ b/share/man/man4/ndis.4
@@ -120,6 +120,9 @@ driver-specific registry keys to control the media setting
which can be configured via the
.Xr sysctl 8
command.
+.Sh DEPRECATION NOTICE
+This driver is scheduled for removal prior to the release of
+.Fx 13.0
.Sh DIAGNOSTICS
.Bl -diag
.It "ndis%d: watchdog timeout"
diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index 26afff64ec99..182a0e1fb506 100644
--- a/sys/dev/if_ndis/if_ndis_pccard.c
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -301,6 +301,8 @@ ndis_attach_pccard(dev)
}
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_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
index bf2f313023df..cbe9a11ef1cd 100644
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ b/sys/dev/if_ndis/if_ndis_pci.c
@@ -335,6 +335,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 a9a8d67aabde..d16ba8d80f96 100644
--- a/sys/dev/if_ndis/if_ndis_usb.c
+++ b/sys/dev/if_ndis/if_ndis_usb.c
@@ -196,6 +196,8 @@ ndisusb_attach(device_t self)
if (ndis_attach(self) != 0)
return (ENXIO);
+ gone_in_dev(self, 13, "ndis removed");
+
return (0);
}