git: d7a7d6a7c3c6 - main - ndis: Per user request, delay removal to 14

[Brooks Davis]

The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=d7a7d6a7c3c6a9b6e03e4739df6801e2a0a296e9

commit d7a7d6a7c3c6a9b6e03e4739df6801e2a0a296e9
Author:     Brooks Davis <brooks at FreeBSD.org>
AuthorDate: 2021-01-11 18:11:49 +0000
Commit:     Brooks Davis <brooks at FreeBSD.org>
CommitDate: 2021-01-11 18:11:49 +0000

    ndis: Per user request, delay removal to 14
    
    We will remove ndis shortly after the 13 branch.
    
    Reviewed by:    emaste
    Differential Revision:  https://reviews.freebsd.org/D28049
---
 share/man/man4/ndis.4         | 2 +-
 sys/dev/if_ndis/if_ndis_pci.c | 2 +-
 sys/dev/if_ndis/if_ndis_usb.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/man/man4/ndis.4 b/share/man/man4/ndis.4
index 0feec231e605..0a1ae39bff62 100644
--- a/share/man/man4/ndis.4
+++ b/share/man/man4/ndis.4
@@ -121,7 +121,7 @@ which can be configured via the
 command.
 .Sh DEPRECATION NOTICE
 This driver is scheduled for removal prior to the release of
-.Fx 13.0
+.Fx 14.0
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "ndis%d: watchdog timeout"
diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
index ba83652d1289..cf1685a920ea 100644
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ b/sys/dev/if_ndis/if_ndis_pci.c
@@ -338,7 +338,7 @@ ndis_attach_pci(dev)
 
 	error = ndis_attach(dev);
 	if (error == 0)
-		gone_in_dev(dev, 13, "ndis removed");
+		gone_in_dev(dev, 14, "ndis removed");
 
 
 fail:
diff --git a/sys/dev/if_ndis/if_ndis_usb.c b/sys/dev/if_ndis/if_ndis_usb.c
index c696a7bf720c..3364d3181532 100644
--- a/sys/dev/if_ndis/if_ndis_usb.c
+++ b/sys/dev/if_ndis/if_ndis_usb.c
@@ -199,7 +199,7 @@ ndisusb_attach(device_t self)
 	if (ndis_attach(self) != 0)
 		return (ENXIO);
 
-	gone_in_dev(self, 13, "ndis removed");
+	gone_in_dev(self, 14, "ndis removed");
 
 	return (0);
 }