Module Name: src
Committed By: maxv
Date: Sat Aug 25 07:48:57 UTC 2018
Modified Files:
src/distrib/sets/lists/man: mi
src/share/man/man4/man4.i386: Makefile
src/sys/arch/amd64/conf: ALL
src/sys/arch/evbarm/conf: ARMADILLO-IOT-G3 CUBOX CUBOX-I MMNET_GENERIC
MPCSA_GENERIC NITROGEN6X
src/sys/arch/i386/conf: ALL GENERIC files.i386
src/sys/arch/iyonix/conf: GENERIC
src/sys/dev/pci: files.pci
Removed Files:
src/share/man/man4/man4.i386: ndis.4
src/sys/compat/ndis: cfg_var.h files.ndis hal_var.h kern_ndis.c
kern_windrv.c nbcompat.c nbcompat.h ndis_var.h ntoskrnl_var.h
pe_var.h resource_var.h subr_hal.c subr_ndis.c subr_ntoskrnl.c
subr_pe.c subr_usbd.c usbd_var.h winx64_wrap.S
src/sys/dev/if_ndis: if_ndis.c if_ndis_pccard.c if_ndis_pci.c
if_ndisvar.h
src/sys/modules/ndis: Makefile
Log Message:
Retire NDIS. It appears that it has never worked, after 13 years it was
still marked as "experimental", and nowadays it may be one more obstacle
to MPification of the network stack.
Discussed on tech-net@.
To generate a diff of this commit:
cvs rdiff -u -r1.1609 -r1.1610 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.77 -r1.78 src/share/man/man4/man4.i386/Makefile
cvs rdiff -u -r1.6 -r0 src/share/man/man4/man4.i386/ndis.4
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/CUBOX
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/CUBOX-I
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/conf/MMNET_GENERIC
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/NITROGEN6X
cvs rdiff -u -r1.447 -r1.448 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1190 -r1.1191 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.395 -r1.396 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/iyonix/conf/GENERIC
cvs rdiff -u -r1.2 -r0 src/sys/compat/ndis/cfg_var.h \
src/sys/compat/ndis/files.ndis src/sys/compat/ndis/resource_var.h
cvs rdiff -u -r1.1 -r0 src/sys/compat/ndis/hal_var.h \
src/sys/compat/ndis/usbd_var.h src/sys/compat/ndis/winx64_wrap.S
cvs rdiff -u -r1.26 -r0 src/sys/compat/ndis/kern_ndis.c \
src/sys/compat/ndis/subr_ntoskrnl.c
cvs rdiff -u -r1.8 -r0 src/sys/compat/ndis/kern_windrv.c \
src/sys/compat/ndis/ntoskrnl_var.h src/sys/compat/ndis/subr_hal.c
cvs rdiff -u -r1.12 -r0 src/sys/compat/ndis/nbcompat.c
cvs rdiff -u -r1.15 -r0 src/sys/compat/ndis/nbcompat.h
cvs rdiff -u -r1.6 -r0 src/sys/compat/ndis/ndis_var.h \
src/sys/compat/ndis/subr_usbd.c
cvs rdiff -u -r1.5 -r0 src/sys/compat/ndis/pe_var.h
cvs rdiff -u -r1.29 -r0 src/sys/compat/ndis/subr_ndis.c
cvs rdiff -u -r1.7 -r0 src/sys/compat/ndis/subr_pe.c
cvs rdiff -u -r1.40 -r0 src/sys/dev/if_ndis/if_ndis.c
cvs rdiff -u -r1.5 -r0 src/sys/dev/if_ndis/if_ndis_pccard.c
cvs rdiff -u -r1.22 -r0 src/sys/dev/if_ndis/if_ndis_pci.c
cvs rdiff -u -r1.9 -r0 src/sys/dev/if_ndis/if_ndisvar.h
cvs rdiff -u -r1.399 -r1.400 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.1 -r0 src/sys/modules/ndis/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1609 src/distrib/sets/lists/man/mi:1.1610
--- src/distrib/sets/lists/man/mi:1.1609 Tue Aug 14 14:49:13 2018
+++ src/distrib/sets/lists/man/mi Sat Aug 25 07:48:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1609 2018/08/14 14:49:13 maxv Exp $
+# $NetBSD: mi,v 1.1610 2018/08/25 07:48:56 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1261,7 +1261,7 @@
./usr/share/man/cat4/i386/lpt.0 man-obsolete obsolete
./usr/share/man/cat4/i386/mem.0 man-obsolete obsolete
./usr/share/man/cat4/i386/mms.0 man-sys-catman .cat
-./usr/share/man/cat4/i386/ndis.0 man-sys-catman .cat
+./usr/share/man/cat4/i386/ndis.0 man-obsolete obsolete
./usr/share/man/cat4/i386/npx.0 man-obsolete obsolete
./usr/share/man/cat4/i386/olms.0 man-obsolete obsolete
./usr/share/man/cat4/i386/omms.0 man-obsolete obsolete
@@ -4396,7 +4396,7 @@
./usr/share/man/html4/i386/lpt.html man-obsolete obsolete
./usr/share/man/html4/i386/mem.html man-obsolete obsolete
./usr/share/man/html4/i386/mms.html man-sys-htmlman html
-./usr/share/man/html4/i386/ndis.html man-sys-htmlman html
+./usr/share/man/html4/i386/ndis.html man-obsolete obsolete
./usr/share/man/html4/i386/npx.html man-obsolete obsolete
./usr/share/man/html4/i386/pcibios.html man-sys-htmlman html
./usr/share/man/html4/i386/pnpbios.html man-sys-htmlman html
@@ -7333,7 +7333,7 @@
./usr/share/man/man4/i386/lpt.4 man-obsolete obsolete
./usr/share/man/man4/i386/mem.4 man-obsolete obsolete
./usr/share/man/man4/i386/mms.4 man-sys-man .man
-./usr/share/man/man4/i386/ndis.4 man-sys-man .man
+./usr/share/man/man4/i386/ndis.4 man-obsolete obsolete
./usr/share/man/man4/i386/npx.4 man-obsolete obsolete
./usr/share/man/man4/i386/olms.4 man-obsolete obsolete
./usr/share/man/man4/i386/omms.4 man-obsolete obsolete
Index: src/share/man/man4/man4.i386/Makefile
diff -u src/share/man/man4/man4.i386/Makefile:1.77 src/share/man/man4/man4.i386/Makefile:1.78
--- src/share/man/man4/man4.i386/Makefile:1.77 Tue Jan 3 08:49:04 2017
+++ src/share/man/man4/man4.i386/Makefile Sat Aug 25 07:48:56 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.77 2017/01/03 08:49:04 maya Exp $
+# $NetBSD: Makefile,v 1.78 2018/08/25 07:48:56 maxv Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/5/93
MAN= apm.4 autoconf.4 \
cmos.4 console.4 \
elanpar.4 elanpex.4 elansc.4 \
gcscide.4 gcscpcib.4 geodewdog.4 geodecntr.4 glxsb.4 gscpcib.4 \
- intro.4 io.4 lms.4 mms.4 ndis.4 \
+ intro.4 io.4 lms.4 mms.4 \
pcibios.4 pnpbios.4 rdcide.4 rdcpcib.4 spic.4 viac7temp.4
MLINKS+=pcibios.4 PCIBIOS.4
MLINKS+=console.4 cons.4
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.97 src/sys/arch/amd64/conf/ALL:1.98
--- src/sys/arch/amd64/conf/ALL:1.97 Tue Aug 14 06:37:59 2018
+++ src/sys/arch/amd64/conf/ALL Sat Aug 25 07:48:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.97 2018/08/14 06:37:59 maxv Exp $
+# $NetBSD: ALL,v 1.98 2018/08/25 07:48:56 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.97 $"
+#ident "ALL-$Revision: 1.98 $"
maxusers 64 # estimated number of users
@@ -136,7 +136,6 @@ options COMPAT_OSSAUDIO # OSS (Voxware)
options COMPAT_NETBSD32 # NetBSD 32-bit
options COMPAT_LINUX # binary compatibility with Linux
options COMPAT_LINUX32 # binary compatibility with Linux 32-bit
-options COMPAT_NDIS # NDIS network driver
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
@@ -976,7 +975,6 @@ malo* at pci? dev ? function ? # Marvell
mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet
mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet
-#ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver
ne* at pci? dev ? function ? # NE2000-compatible Ethernet
nfe* at pci? dev ? function ? # NVIDIA nForce Ethernet
ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
Index: src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
diff -u src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.14 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.15
--- src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.14 Wed Aug 1 20:04:10 2018
+++ src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 Sat Aug 25 07:48:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO-IOT-G3,v 1.14 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: ARMADILLO-IOT-G3,v 1.15 2018/08/25 07:48:56 maxv Exp $
#
# ARMADILLO-IOT-G3 -- Atmark Techno, Armadillo-IoT G3
#
@@ -76,8 +76,6 @@ makeoptions COPY_SYMTAB=1
include "conf/compat_netbsd60.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-#options COMPAT_NDIS # NDIS network driver
-#options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
# Wedge support
Index: src/sys/arch/evbarm/conf/CUBOX
diff -u src/sys/arch/evbarm/conf/CUBOX:1.11 src/sys/arch/evbarm/conf/CUBOX:1.12
--- src/sys/arch/evbarm/conf/CUBOX:1.11 Wed Aug 1 20:04:11 2018
+++ src/sys/arch/evbarm/conf/CUBOX Sat Aug 25 07:48:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX,v 1.11 2018/08/01 20:04:11 maxv Exp $
+# $NetBSD: CUBOX,v 1.12 2018/08/25 07:48:56 maxv Exp $
#
# CUBOX -- SolidRun Ltd. Cubox kernel
#
@@ -78,7 +78,6 @@ include "conf/compat_netbsd60.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-#options COMPAT_NDIS # NDIS network driver
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
Index: src/sys/arch/evbarm/conf/CUBOX-I
diff -u src/sys/arch/evbarm/conf/CUBOX-I:1.17 src/sys/arch/evbarm/conf/CUBOX-I:1.18
--- src/sys/arch/evbarm/conf/CUBOX-I:1.17 Wed Aug 1 20:04:11 2018
+++ src/sys/arch/evbarm/conf/CUBOX-I Sat Aug 25 07:48:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX-I,v 1.17 2018/08/01 20:04:11 maxv Exp $
+# $NetBSD: CUBOX-I,v 1.18 2018/08/25 07:48:56 maxv Exp $
#
# CuBox-i
# - http://www.solid-run.com/products/cubox-i-mini-computer/
@@ -78,7 +78,6 @@ include "conf/compat_netbsd60.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-#options COMPAT_NDIS # NDIS network driver
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.40 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.41
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.40 Wed Aug 1 20:04:11 2018
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC Sat Aug 25 07:48:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.40 2018/08/01 20:04:11 maxv Exp $
+# $NetBSD: MMNET_GENERIC,v 1.41 2018/08/25 07:48:56 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mmnet"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.40 $"
+#ident "GENERIC-$Revision: 1.41 $"
maxusers 32 # estimated number of users
@@ -95,7 +95,6 @@ options COMPAT_NETBSD32 # allow running
#options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
#options COMPAT_LINUX # binary compatibility with Linux
-#options COMPAT_NDIS # NDIS network driver
# File systems
file-system FFS # UFS
Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.61 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.62
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.61 Wed Aug 1 20:04:11 2018
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC Sat Aug 25 07:48:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.61 2018/08/01 20:04:11 maxv Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.62 2018/08/25 07:48:56 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mpcsa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.61 $"
+#ident "GENERIC-$Revision: 1.62 $"
maxusers 32 # estimated number of users
@@ -95,7 +95,6 @@ options COMPAT_NETBSD32 # allow running
#options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
#options COMPAT_LINUX # binary compatibility with Linux
-#options COMPAT_NDIS # NDIS network driver
# File systems
file-system FFS # UFS
Index: src/sys/arch/evbarm/conf/NITROGEN6X
diff -u src/sys/arch/evbarm/conf/NITROGEN6X:1.19 src/sys/arch/evbarm/conf/NITROGEN6X:1.20
--- src/sys/arch/evbarm/conf/NITROGEN6X:1.19 Wed Aug 1 20:04:11 2018
+++ src/sys/arch/evbarm/conf/NITROGEN6X Sat Aug 25 07:48:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: NITROGEN6X,v 1.19 2018/08/01 20:04:11 maxv Exp $
+# $NetBSD: NITROGEN6X,v 1.20 2018/08/25 07:48:56 maxv Exp $
#
# Nitrogen6X
# - http://boundarydevices.com/products/nitrogen6x-board-imx6-arm-cortex-a9-sbc/
@@ -78,7 +78,6 @@ include "conf/compat_netbsd60.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-#options COMPAT_NDIS # NDIS network driver
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.447 src/sys/arch/i386/conf/ALL:1.448
--- src/sys/arch/i386/conf/ALL:1.447 Tue Aug 14 06:37:59 2018
+++ src/sys/arch/i386/conf/ALL Sat Aug 25 07:48:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.447 2018/08/14 06:37:59 maxv Exp $
+# $NetBSD: ALL,v 1.448 2018/08/25 07:48:56 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.447 $"
+#ident "ALL-$Revision: 1.448 $"
maxusers 64 # estimated number of users
@@ -133,7 +133,6 @@ options COMPAT_386BSD_MBRPART # recogni
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
options COMPAT_LINUX # binary compatibility with Linux
options COMPAT_FREEBSD # binary compatibility with FreeBSD
-options COMPAT_NDIS # NDIS network driver
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
@@ -1066,7 +1065,6 @@ malo* at pci? dev ? function ? # Marvell
mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet
mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet
-#ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver
ne* at pci? dev ? function ? # NE2000-compatible Ethernet
nfe* at pci? dev ? function ? # NVIDIA nForce Ethernet
ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1190 src/sys/arch/i386/conf/GENERIC:1.1191
--- src/sys/arch/i386/conf/GENERIC:1.1190 Tue Aug 14 06:37:59 2018
+++ src/sys/arch/i386/conf/GENERIC Sat Aug 25 07:48:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1190 2018/08/14 06:37:59 maxv Exp $
+# $NetBSD: GENERIC,v 1.1191 2018/08/25 07:48:56 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1190 $"
+#ident "GENERIC-$Revision: 1.1191 $"
maxusers 64 # estimated number of users
@@ -131,7 +131,6 @@ include "conf/compat_netbsd09.config"
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
-#options COMPAT_NDIS # NDIS network driver
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
@@ -1000,7 +999,6 @@ malo* at pci? dev ? function ? # Marvell
mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet
mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet
-#ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver
ne* at pci? dev ? function ? # NE2000-compatible Ethernet
nfe* at pci? dev ? function ? # NVIDIA nForce Ethernet
ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
Index: src/sys/arch/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.395 src/sys/arch/i386/conf/files.i386:1.396
--- src/sys/arch/i386/conf/files.i386:1.395 Fri Jul 13 09:37:32 2018
+++ src/sys/arch/i386/conf/files.i386 Sat Aug 25 07:48:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.395 2018/07/13 09:37:32 maxv Exp $
+# $NetBSD: files.i386,v 1.396 2018/08/25 07:48:56 maxv Exp $
#
# new style config file for i386 architecture
#
@@ -326,9 +326,6 @@ file arch/x86/x86/linux_trap.c compat_l
# FreeBSD binary compatibility (COMPAT_FREEBSD)
include "compat/freebsd/files.freebsd"
-# NDIS compatibilty (COMPAT_NDIS)
-include "compat/ndis/files.ndis"
-
# OSS audio driver compatibility
include "compat/ossaudio/files.ossaudio"
Index: src/sys/arch/iyonix/conf/GENERIC
diff -u src/sys/arch/iyonix/conf/GENERIC:1.99 src/sys/arch/iyonix/conf/GENERIC:1.100
--- src/sys/arch/iyonix/conf/GENERIC:1.99 Wed Aug 1 20:04:12 2018
+++ src/sys/arch/iyonix/conf/GENERIC Sat Aug 25 07:48:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.99 2018/08/01 20:04:12 maxv Exp $
+# $NetBSD: GENERIC,v 1.100 2018/08/25 07:48:56 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/iyonix/conf/std.iyonix"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.99 $"
+#ident "GENERIC-$Revision: 1.100 $"
maxusers 32 # estimated number of users
@@ -398,7 +398,6 @@ uk* at atapibus? drive ? flags 0x0000 #
#mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
#msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet
#mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet
-##ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver
#ne* at pci? dev ? function ? # NE2000-compatible Ethernet
#nfe* at pci? dev ? function ? # NVIDIA nForce Ethernet
#ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.399 src/sys/dev/pci/files.pci:1.400
--- src/sys/dev/pci/files.pci:1.399 Wed Aug 8 21:00:28 2018
+++ src/sys/dev/pci/files.pci Sat Aug 25 07:48:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.399 2018/08/08 21:00:28 maya Exp $
+# $NetBSD: files.pci,v 1.400 2018/08/25 07:48:57 maxv Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -933,12 +933,6 @@ file dev/pci/if_dge.c dge
attach re at pci with re_pci
file dev/pci/if_re_pci.c re_pci
-# Windows NDIS drivers (Experimental)
-device ndis
-attach ndis at pci
-file dev/if_ndis/if_ndis.c ndis
-file dev/if_ndis/if_ndis_pci.c ndis
-
# Intel PRO/Wireless 2100
device ipw: ifnet, arp, wlan, firmload
attach ipw at pci
