Module Name: src
Committed By: thorpej
Date: Mon Jan 20 18:38:22 UTC 2020
Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/share/man/man4: Makefile
src/share/man/man9: Makefile ethersubr.9
src/sys/arch/algor/conf: P4032 P5064 P6032
src/sys/arch/alpha/conf: GENERIC INSTALL RAWHIDE
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
src/sys/arch/arc/conf: GENERIC
src/sys/arch/cats/conf: GENERIC INSTALL
src/sys/arch/cobalt/conf: GENERIC INSTALL
src/sys/arch/evbarm/conf: IXDP425 ZAO425
src/sys/arch/evbmips/conf: MALTA
src/sys/arch/evbppc/conf: PMPPC WALNUT
src/sys/arch/hppa/conf: GENERIC
src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY
INSTALL_TINY XEN3PAE_DOM0
src/sys/arch/macppc/conf: GENERIC
src/sys/arch/pmax/conf: GENERIC GENERIC64 INSTALL INSTALL64
src/sys/arch/sgimips/conf: GENERIC32_IP3x
src/sys/arch/sparc64/conf: GENERIC
src/sys/arch/vax/conf: GENERIC INSTALL VAX780
src/sys/conf: files
src/sys/dev/eisa: files.eisa
src/sys/dev/pci: files.pci
src/sys/dev/tc: files.tc
src/sys/net: Makefile files.net if.c
src/sys/netinet: if_arp.c ip_carp.c
src/sys/netinet6: in6.c in6_ifattach.c nd6.c nd6_nbr.c
Removed Files:
src/share/man/man4: fpa.4
src/sys/dev/eisa: if_fea.c
src/sys/dev/ic: pdq.c pdq_ifsubr.c pdqreg.h pdqvar.h
src/sys/dev/pci: if_fpa.c
src/sys/dev/tc: if_fta.c
src/sys/net: if_fddi.h if_fddisubr.c
Log Message:
Remove FDDI support.
To generate a diff of this commit:
cvs rdiff -u -r1.2304 -r1.2305 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1674 -r1.1675 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.698 -r1.699 src/share/man/man4/Makefile
cvs rdiff -u -r1.15 -r0 src/share/man/man4/fpa.4
cvs rdiff -u -r1.444 -r1.445 src/share/man/man9/Makefile
cvs rdiff -u -r1.27 -r1.28 src/share/man/man9/ethersubr.9
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/algor/conf/P4032
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/algor/conf/P5064
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/algor/conf/P6032
cvs rdiff -u -r1.398 -r1.399 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/alpha/conf/INSTALL
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/alpha/conf/RAWHIDE
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.557 -r1.558 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.171 -r1.172 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/arc/conf/GENERIC
cvs rdiff -u -r1.175 -r1.176 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.164 -r1.165 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/evbarm/conf/IXDP425
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/ZAO425
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/evbmips/conf/MALTA
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbppc/conf/PMPPC
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/evbppc/conf/WALNUT
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/hppa/conf/GENERIC
cvs rdiff -u -r1.484 -r1.485 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1221 -r1.1222 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.165 -r1.166 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.360 -r1.361 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.199 -r1.200 src/sys/arch/pmax/conf/GENERIC
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/pmax/conf/GENERIC64
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/pmax/conf/INSTALL
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/pmax/conf/INSTALL64
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/sgimips/conf/GENERIC32_IP3x
cvs rdiff -u -r1.221 -r1.222 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.211 -r1.212 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/vax/conf/INSTALL
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/vax/conf/VAX780
cvs rdiff -u -r1.1252 -r1.1253 src/sys/conf/files
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/eisa/files.eisa
cvs rdiff -u -r1.48 -r0 src/sys/dev/eisa/if_fea.c
cvs rdiff -u -r1.41 -r0 src/sys/dev/ic/pdq.c
cvs rdiff -u -r1.67 -r0 src/sys/dev/ic/pdq_ifsubr.c
cvs rdiff -u -r1.19 -r0 src/sys/dev/ic/pdqreg.h
cvs rdiff -u -r1.50 -r0 src/sys/dev/ic/pdqvar.h
cvs rdiff -u -r1.423 -r1.424 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.63 -r0 src/sys/dev/pci/if_fpa.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/tc/files.tc
cvs rdiff -u -r1.29 -r0 src/sys/dev/tc/if_fta.c
cvs rdiff -u -r1.40 -r1.41 src/sys/net/Makefile
cvs rdiff -u -r1.23 -r1.24 src/sys/net/files.net
cvs rdiff -u -r1.467 -r1.468 src/sys/net/if.c
cvs rdiff -u -r1.14 -r0 src/sys/net/if_fddi.h
cvs rdiff -u -r1.111 -r0 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.290 -r1.291 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.106 -r1.107 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.276 -r1.277 src/sys/netinet6/in6.c
cvs rdiff -u -r1.117 -r1.118 src/sys/netinet6/in6_ifattach.c
cvs rdiff -u -r1.265 -r1.266 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.175 -r1.176 src/sys/netinet6/nd6_nbr.c
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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2304 src/distrib/sets/lists/comp/mi:1.2305
--- src/distrib/sets/lists/comp/mi:1.2304 Sun Jan 19 20:41:17 2020
+++ src/distrib/sets/lists/comp/mi Mon Jan 20 18:38:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2304 2020/01/19 20:41:17 riastradh Exp $
+# $NetBSD: mi,v 1.2305 2020/01/20 18:38:18 thorpej Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -2345,7 +2345,7 @@
./usr/include/net/if_dl.h comp-c-include
./usr/include/net/if_ether.h comp-c-include
./usr/include/net/if_etherip.h comp-obsolete obsolete
-./usr/include/net/if_fddi.h comp-c-include
+./usr/include/net/if_fddi.h comp-obsolete obsolete
./usr/include/net/if_gif.h comp-c-include
./usr/include/net/if_gre.h comp-c-include
./usr/include/net/if_hippi.h comp-obsolete obsolete
@@ -11099,9 +11099,9 @@
./usr/share/man/cat9/fdclone.0 comp-sys-catman .cat
./usr/share/man/cat9/fdcloseexec.0 comp-sys-catman .cat
./usr/share/man/cat9/fdcopy.0 comp-sys-catman .cat
-./usr/share/man/cat9/fddi_addmulti.0 comp-sys-catman .cat
-./usr/share/man/cat9/fddi_delmulti.0 comp-sys-catman .cat
-./usr/share/man/cat9/fddi_ifattach.0 comp-sys-catman .cat
+./usr/share/man/cat9/fddi_addmulti.0 comp-obsolete obsolete
+./usr/share/man/cat9/fddi_delmulti.0 comp-obsolete obsolete
+./usr/share/man/cat9/fddi_ifattach.0 comp-obsolete obsolete
./usr/share/man/cat9/fdexpand.0 comp-sys-catman .cat
./usr/share/man/cat9/fdfree.0 comp-sys-catman .cat
./usr/share/man/cat9/fdinit.0 comp-sys-catman .cat
@@ -19034,9 +19034,9 @@
./usr/share/man/html9/fdclone.html comp-sys-htmlman html
./usr/share/man/html9/fdcloseexec.html comp-sys-htmlman html
./usr/share/man/html9/fdcopy.html comp-sys-htmlman html
-./usr/share/man/html9/fddi_addmulti.html comp-sys-htmlman html
-./usr/share/man/html9/fddi_delmulti.html comp-sys-htmlman html
-./usr/share/man/html9/fddi_ifattach.html comp-sys-htmlman html
+./usr/share/man/html9/fddi_addmulti.html comp-obsolete obsolete
+./usr/share/man/html9/fddi_delmulti.html comp-obsolete obsolete
+./usr/share/man/html9/fddi_ifattach.html comp-obsolete obsolete
./usr/share/man/html9/fdexpand.html comp-sys-htmlman html
./usr/share/man/html9/fdfree.html comp-sys-htmlman html
./usr/share/man/html9/fdinit.html comp-sys-htmlman html
@@ -27114,9 +27114,9 @@
./usr/share/man/man9/fdclone.9 comp-sys-man .man
./usr/share/man/man9/fdcloseexec.9 comp-sys-man .man
./usr/share/man/man9/fdcopy.9 comp-sys-man .man
-./usr/share/man/man9/fddi_addmulti.9 comp-sys-man .man
-./usr/share/man/man9/fddi_delmulti.9 comp-sys-man .man
-./usr/share/man/man9/fddi_ifattach.9 comp-sys-man .man
+./usr/share/man/man9/fddi_addmulti.9 comp-obsolete obsolete
+./usr/share/man/man9/fddi_delmulti.9 comp-obsolete obsolete
+./usr/share/man/man9/fddi_ifattach.9 comp-obsolete obsolete
./usr/share/man/man9/fdexpand.9 comp-sys-man .man
./usr/share/man/man9/fdfree.9 comp-sys-man .man
./usr/share/man/man9/fdinit.9 comp-sys-man .man
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1674 src/distrib/sets/lists/man/mi:1.1675
--- src/distrib/sets/lists/man/mi:1.1674 Sun Jan 19 20:41:17 2020
+++ src/distrib/sets/lists/man/mi Mon Jan 20 18:38:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1674 2020/01/19 20:41:17 riastradh Exp $
+# $NetBSD: mi,v 1.1675 2020/01/20 18:38:18 thorpej Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1104,16 +1104,16 @@
./usr/share/man/cat4/faith.0 man-sys-catman .cat
./usr/share/man/cat4/fast_ipsec.0 man-obsolete obsolete
./usr/share/man/cat4/fd.0 man-sys-catman .cat
-./usr/share/man/cat4/fea.0 man-sys-catman .cat
+./usr/share/man/cat4/fea.0 man-obsolete obsolete
./usr/share/man/cat4/filemon.0 man-obsolete obsolete
./usr/share/man/cat4/finsio.0 man-sys-catman .cat
./usr/share/man/cat4/flash.0 man-sys-catman .cat
./usr/share/man/cat4/fms.0 man-sys-catman .cat
./usr/share/man/cat4/fmv.0 man-sys-catman .cat
-./usr/share/man/cat4/fpa.0 man-sys-catman .cat
+./usr/share/man/cat4/fpa.0 man-obsolete obsolete
./usr/share/man/cat4/fss.0 man-sys-catman .cat
./usr/share/man/cat4/fssbs.0 man-obsolete obsolete
-./usr/share/man/cat4/fta.0 man-sys-catman .cat
+./usr/share/man/cat4/fta.0 man-obsolete obsolete
./usr/share/man/cat4/fujbp.0 man-sys-catman .cat
./usr/share/man/cat4/fujhk.0 man-sys-catman .cat
./usr/share/man/cat4/fujitsu.0 man-obsolete obsolete
@@ -4288,16 +4288,16 @@
./usr/share/man/html4/faith.html man-sys-htmlman html
./usr/share/man/html4/fast_ipsec.html man-obsolete obsolete
./usr/share/man/html4/fd.html man-sys-htmlman html
-./usr/share/man/html4/fea.html man-sys-htmlman html
+./usr/share/man/html4/fea.html man-obsolete obsolete
./usr/share/man/html4/filemon.html man-obsolete obsolete
./usr/share/man/html4/finsio.html man-sys-htmlman html
./usr/share/man/html4/flash.html man-sys-htmlman html
./usr/share/man/html4/fms.html man-sys-htmlman html
./usr/share/man/html4/fmv.html man-sys-htmlman html
-./usr/share/man/html4/fpa.html man-sys-htmlman html
+./usr/share/man/html4/fpa.html man-obsolete obsolete
./usr/share/man/html4/fss.html man-sys-htmlman html
./usr/share/man/html4/fssbs.html man-obsolete obsolete
-./usr/share/man/html4/fta.html man-sys-htmlman html
+./usr/share/man/html4/fta.html man-obsolete obsolete
./usr/share/man/html4/fujbp.html man-sys-htmlman html
./usr/share/man/html4/fujhk.html man-sys-htmlman html
./usr/share/man/html4/fujitsu.html man-obsolete obsolete
@@ -7244,16 +7244,16 @@
./usr/share/man/man4/faith.4 man-sys-man .man
./usr/share/man/man4/fast_ipsec.4 man-obsolete obsolete
./usr/share/man/man4/fd.4 man-sys-man .man
-./usr/share/man/man4/fea.4 man-sys-man .man
+./usr/share/man/man4/fea.4 man-obsolete obsolete
./usr/share/man/man4/filemon.4 man-obsolete obsolete
./usr/share/man/man4/finsio.4 man-sys-man .man
./usr/share/man/man4/flash.4 man-sys-man .man
./usr/share/man/man4/fms.4 man-sys-man .man
./usr/share/man/man4/fmv.4 man-sys-man .man
-./usr/share/man/man4/fpa.4 man-sys-man .man
+./usr/share/man/man4/fpa.4 man-obsolete obsolete
./usr/share/man/man4/fss.4 man-sys-man .man
./usr/share/man/man4/fssbs.4 man-obsolete obsolete
-./usr/share/man/man4/fta.4 man-sys-man .man
+./usr/share/man/man4/fta.4 man-obsolete obsolete
./usr/share/man/man4/fujbp.4 man-sys-man .man
./usr/share/man/man4/fujhk.4 man-sys-man .man
./usr/share/man/man4/fujitsu.4 man-obsolete obsolete
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.698 src/share/man/man4/Makefile:1.699
--- src/share/man/man4/Makefile:1.698 Sun Jan 19 20:41:18 2020
+++ src/share/man/man4/Makefile Mon Jan 20 18:38:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.698 2020/01/19 20:41:18 riastradh Exp $
+# $NetBSD: Makefile,v 1.699 2020/01/20 18:38:17 thorpej Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -23,7 +23,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a
dmphy.4 dpt.4 dpti.4 drm.4 drum.4 drvctl.4 dtv.4 dtviic.4 dwctwo.4 \
eap.4 ebus.4 edc.4 elmc.4 emuxki.4 ena.4 envsys.4 ep.4 esh.4 \
esa.4 esiop.4 esm.4 eso.4 et.4 etphy.4 exphy.4 \
- fd.4 finsio.4 flash.4 fpa.4 fms.4 fss.4 \
+ fd.4 finsio.4 flash.4 fms.4 fss.4 \
fujbp.4 full.4 fxp.4 \
gcscaudio.4 gem.4 genfb.4 gentbi.4 geodeide.4 \
glxtphy.4 gpib.4 gpio.4 gpioirq.4 gpiolock.4 gpiopps.4 gpiopwm.4 \
@@ -206,7 +206,6 @@ MLINKS+=dbcool.4 adt7475.4
MLINKS+=dbcool.4 adt7476.4
MLINKS+=dk.4 wedge.4
MLINKS+=fd.4 stderr.4 fd.4 stdin.4 fd.4 stdout.4
-MLINKS+=fpa.4 fea.4 fpa.4 fta.4
MLINKS+=fujbp.4 fujhk.4
MLINKS+=hdaudio.4 hdafg.4
MLINKS+=hdaudio.4 hdaudiobus.4
Index: src/share/man/man9/Makefile
diff -u src/share/man/man9/Makefile:1.444 src/share/man/man9/Makefile:1.445
--- src/share/man/man9/Makefile:1.444 Fri Nov 29 22:38:28 2019
+++ src/share/man/man9/Makefile Mon Jan 20 18:38:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.444 2019/11/29 22:38:28 riastradh Exp $
+# $NetBSD: Makefile,v 1.445 2020/01/20 18:38:18 thorpej Exp $
# Makefile for section 9 (kernel function and variable) manual pages.
@@ -319,9 +319,7 @@ MLINKS+=dofileread.9 dofilewrite.9 \
MLINKS+=do_setresuid.9 do_setresgid.9
MLINKS+=ethersubr.9 ether_ifattach.9 ethersubr.9 ether_addmulti.9 \
ethersubr.9 ether_delmulti.9 ethersubr.9 ETHER_IS_MULTICAST.9 \
- ethersubr.9 ETHER_FIRST_MULTI.9 ethersubr.9 ETHER_NEXT_MULTI.9 \
- ethersubr.9 fddi_ifattach.9 \
- ethersubr.9 fddi_addmulti.9 ethersubr.9 fddi_delmulti.9
+ ethersubr.9 ETHER_FIRST_MULTI.9 ethersubr.9 ETHER_NEXT_MULTI.9
MLINKS+=evcnt.9 evcnt_attach_dynamic.9 evcnt.9 evcnt_attach_static.9 \
evcnt.9 evcnt_detach.9
MLINKS+=extent.9 extent_create.9 extent.9 extent_destroy.9 \
Index: src/share/man/man9/ethersubr.9
diff -u src/share/man/man9/ethersubr.9:1.27 src/share/man/man9/ethersubr.9:1.28
--- src/share/man/man9/ethersubr.9:1.27 Wed Dec 28 11:44:58 2016
+++ src/share/man/man9/ethersubr.9 Mon Jan 20 18:38:18 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: ethersubr.9,v 1.27 2016/12/28 11:44:58 wiz Exp $
+.\" $NetBSD: ethersubr.9,v 1.28 2020/01/20 18:38:18 thorpej Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd December 28, 2016
+.Dd January 19, 2020
.Dt ETHERSUBR 9
.Os
.Sh NAME
@@ -37,11 +37,8 @@
.Nm ether_delmulti ,
.Nm ETHER_FIRST_MULTI ,
.Nm ETHER_NEXT_MULTI ,
-.Nm ETHER_IS_MULTICAST ,
-.Nm fddi_ifattach ,
-.Nm fddi_addmulti ,
-.Nm fddi_delmulti
-.Nd Ethernet and FDDI driver support functions and macros
+.Nm ETHER_IS_MULTICAST
+.Nd Ethernet driver support functions and macros
.Sh SYNOPSIS
.In net/if_ether.h
.Ft void
@@ -56,13 +53,6 @@
.Fn ETHER_NEXT_MULTI "struct ether_multistep step" "struct ether_multi *enm"
.Ft int
.Fn ETHER_IS_MULTICAST "uint8_t *addr"
-.In net/if_fddi.h
-.Ft void
-.Fn fddi_ifattach "struct ifnet *ifp" "uint8_t *lla"
-.Ft int
-.Fn fddi_addmulti "const struct sockaddr *sa" "struct ethercom *ec"
-.Ft int
-.Fn fddi_delmulti "const struct sockaddr *sa" "struct ethercom *ec"
.Sh DESCRIPTION
The
.Nm
@@ -75,11 +65,6 @@ attribute in their
.Ar files
declaration and call the appropriate functions as specified below.
.Pp
-FDDI drivers must request the "fddi" attribute in their "files"
-declaration and call the functions tagged with "fddi_" or "FDDI_"
-instead, where different.
-Some macros are shared.
-.Pp
Note that you also need the
.Xr arp 9
stuff to support IPv4 on your hardware.
@@ -103,8 +88,6 @@ and calling
.Fn if_set_sadl .
.Pp
This function must be called from the driver's attach function.
-.It Fn fddi_ifattach "ifp" "lla"
-Corresponding function for FDDI devices.
.It Fn ether_addmulti "sa" "ec"
.It Fn ether_delmulti "sa" "ec"
Add
@@ -154,9 +137,6 @@ returns, in addition to the above errors
.Er ENXIO
if the specified address
can't be found in the list of multicast addresses.
-.It Fn fddi_addmulti "sa" "ec"
-.It Fn fddi_delmulti "sa" "ec"
-Corresponding functions for FDDI devices.
.It Fn ETHER_NEXT_MULTI "step" "enm"
A macro to step through all of the
.Em ether_multi
@@ -182,11 +162,6 @@ Ethernet support functions are declared
.In net/if_ether.h
and defined (if not implemented as macro) in
.Pa sys/net/if_ethersubr.c .
-.Pp
-FDDI support functions are declared in
-.In net/if_fddi.h
-and defined (if not implemented as macro) in
-.Pa sys/net/if_fddisubr.c .
.Sh SEE ALSO
.Xr arp 9
.Sh HISTORY
Index: src/sys/arch/algor/conf/P4032
diff -u src/sys/arch/algor/conf/P4032:1.79 src/sys/arch/algor/conf/P4032:1.80
--- src/sys/arch/algor/conf/P4032:1.79 Sat Apr 13 08:22:58 2019
+++ src/sys/arch/algor/conf/P4032 Mon Jan 20 18:38:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: P4032,v 1.79 2019/04/13 08:22:58 isaki Exp $
+# $NetBSD: P4032,v 1.80 2020/01/20 18:38:19 thorpej Exp $
#
# Algorithmics P-4032 kernel.
#
@@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P4032-$Revision: 1.79 $"
+#ident "P4032-$Revision: 1.80 $"
maxusers 32
@@ -134,7 +134,6 @@ pci* at vtpbc?
#epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
#eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
#ex* at pci? dev ? function ? # 3COM 3c90x[B] Ethernet
-#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
#fxp* at pci? dev ? function ? # Intel EEPRO 10+/100B
#gsip* at pci? dev ? function ? # NS DP83820 Gigabit Ethernet
#isp* at pci? dev ? function ? # Qlogic ISP 10x0 SCSI
Index: src/sys/arch/algor/conf/P5064
diff -u src/sys/arch/algor/conf/P5064:1.90 src/sys/arch/algor/conf/P5064:1.91
--- src/sys/arch/algor/conf/P5064:1.90 Sat Apr 13 08:22:58 2019
+++ src/sys/arch/algor/conf/P5064 Mon Jan 20 18:38:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: P5064,v 1.90 2019/04/13 08:22:58 isaki Exp $
+# $NetBSD: P5064,v 1.91 2020/01/20 18:38:19 thorpej Exp $
#
# Algorithmics P-5064 kernel.
#
@@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P5064-$Revision: 1.90 $"
+#ident "P5064-$Revision: 1.91 $"
maxusers 32
@@ -130,7 +130,6 @@ pci* at vtpbc?
#epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
#eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
#ex* at pci? dev ? function ? # 3COM 3c90x[B] Ethernet
-#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
#fxp* at pci? dev ? function ? # Intel EEPRO 10+/100B
#gsip* at pci? dev ? function ? # NS DP83820 Gigabit Ethernet
#isp* at pci? dev ? function ? # Qlogic ISP 10x0 SCSI
Index: src/sys/arch/algor/conf/P6032
diff -u src/sys/arch/algor/conf/P6032:1.81 src/sys/arch/algor/conf/P6032:1.82
--- src/sys/arch/algor/conf/P6032:1.81 Sat Apr 13 08:22:58 2019
+++ src/sys/arch/algor/conf/P6032 Mon Jan 20 18:38:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: P6032,v 1.81 2019/04/13 08:22:58 isaki Exp $
+# $NetBSD: P6032,v 1.82 2020/01/20 18:38:19 thorpej Exp $
#
# Algorithmics P-6032 kernel.
#
@@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P6032-$Revision: 1.81 $"
+#ident "P6032-$Revision: 1.82 $"
maxusers 32
@@ -122,7 +122,6 @@ pci* at bonito?
#epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
#eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
#ex* at pci? dev ? function ? # 3COM 3c90x[B] Ethernet
-#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
#fxp* at pci? dev ? function ? # Intel EEPRO 10+/100B
#gsip* at pci? dev ? function ? # NS DP83820 Gigabit Ethernet
#isp* at pci? dev ? function ? # Qlogic ISP 10x0 SCSI
Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.398 src/sys/arch/alpha/conf/GENERIC:1.399
--- src/sys/arch/alpha/conf/GENERIC:1.398 Sun Jan 19 06:55:22 2020
+++ src/sys/arch/alpha/conf/GENERIC Mon Jan 20 18:38:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.398 2020/01/19 06:55:22 thorpej Exp $
+# $NetBSD: GENERIC,v 1.399 2020/01/20 18:38:19 thorpej Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.398 $"
+ident "GENERIC-$Revision: 1.399 $"
maxusers 32
@@ -235,7 +235,6 @@ tcds* at tc? slot ? offset ?
asc* at tcds? chip ?
asc* at tc? slot ? offset ?
le* at tc? slot ? offset ?
-fta* at tc? slot ? offset ? # DEC DEFTA FDDI cards
cfb* at tc? slot ? offset ?
mfb* at tc? slot ? offset ?
tfb* at tc? slot ? offset ?
@@ -310,7 +309,6 @@ ep* at pci? dev ? function ? # 3COM 3c5
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
ex* at pci? dev ? function ? # 3COM 3c90x[BC] Ethernet
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EEPRO 10+/100B
gsip* at pci? dev ? function ? # NS DP83820 Gigabit Ethernet
iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI
@@ -465,7 +463,6 @@ ahb* at eisa? slot ? # Adaptec 174[024
ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI
bha* at eisa? slot ? # BusLogic 7xx SCSI
ep* at eisa? slot ? # 3COM 3c579 Ethernet (untested)
-fea* at eisa? slot ? # DEC DEFEA FDDI
mlx* at eisa? slot ? # Mylex DAC960 / DEC SWXCR (untested)
tlp* at eisa? slot ? # DEC DE-425 Ethernet
depca* at eisa? slot ? # DEC DE-422 Ethernet
Index: src/sys/arch/alpha/conf/INSTALL
diff -u src/sys/arch/alpha/conf/INSTALL:1.111 src/sys/arch/alpha/conf/INSTALL:1.112
--- src/sys/arch/alpha/conf/INSTALL:1.111 Thu Sep 6 05:36:49 2018
+++ src/sys/arch/alpha/conf/INSTALL Mon Jan 20 18:38:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.111 2018/09/06 05:36:49 maxv Exp $
+# $NetBSD: INSTALL,v 1.112 2020/01/20 18:38:19 thorpej Exp $
#
# Alpha INSTALL kernel.
@@ -127,7 +127,6 @@ tcds* at tc? slot ? offset ?
asc* at tcds? chip ?
asc* at tc? slot ? offset ?
le* at tc? slot ? offset ?
-fta* at tc? slot ? offset ? # DEC DEFTA FDDI cards
cfb* at tc? slot ? offset ?
mfb* at tc? slot ? offset ?
tfb* at tc? slot ? offset ?
@@ -188,7 +187,6 @@ dpt* at pci? dev ? function ? # DPT Sma
ep* at pci? dev ? function ? # 3COM 3c59x/3c90x Ethernet
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
ex* at pci? dev ? function ? # 3COM 3c90x[BC] Ethernet
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EEPRO 10+/100B
gsip* at pci? dev ? function ? # NS DP83820 Gigabit Ethernet
iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI
@@ -280,7 +278,6 @@ ahb* at eisa? slot ? # Adaptec 174[024
ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI
bha* at eisa? slot ? # BusLogic 7xx SCSI
ep* at eisa? slot ? # 3COM 3c579 Ethernet (untested)
-fea* at eisa? slot ? # DEC DEFEA FDDI
mlx* at eisa? slot ? # Mylex DAC960 / DEC SWXCR (untested)
tlp* at eisa? slot ? # DEC DE-425 Ethernet
depca* at eisa? slot ? # DEC DE-422 Ethernet
Index: src/sys/arch/alpha/conf/RAWHIDE
diff -u src/sys/arch/alpha/conf/RAWHIDE:1.44 src/sys/arch/alpha/conf/RAWHIDE:1.45
--- src/sys/arch/alpha/conf/RAWHIDE:1.44 Sun Jan 19 06:55:22 2020
+++ src/sys/arch/alpha/conf/RAWHIDE Mon Jan 20 18:38:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: RAWHIDE,v 1.44 2020/01/19 06:55:22 thorpej Exp $
+# $NetBSD: RAWHIDE,v 1.45 2020/01/20 18:38:19 thorpej Exp $
#
# Alpha 4100 stripped for action server kernel.
#
@@ -60,7 +60,6 @@ ahc* at pci? dev ? function ? # Adaptec
bha* at pci? dev ? function ? # BusLogic 9xx SCSI (untested)
cy* at pci? dev ? function ? # Cyclades Cyclom-Y (untested)
ep* at pci? dev ? function ? # 3COM 3c59x/3c90x Ethernet
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EEPRO 10+/100B
isp* at pci? dev ? function ? # Qlogic ISP 10x0 SCSI
siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.140 src/sys/arch/amd64/conf/ALL:1.141
--- src/sys/arch/amd64/conf/ALL:1.140 Sun Jan 19 20:41:18 2020
+++ src/sys/arch/amd64/conf/ALL Mon Jan 20 18:38:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.140 2020/01/19 20:41:18 riastradh Exp $
+# $NetBSD: ALL,v 1.141 2020/01/20 18:38:19 thorpej 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.140 $"
+#ident "ALL-$Revision: 1.141 $"
maxusers 64 # estimated number of users
@@ -976,7 +976,6 @@ ep* at pci? dev ? function ? # 3Com 3c59
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 3c90x[BC]
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.557 src/sys/arch/amd64/conf/GENERIC:1.558
--- src/sys/arch/amd64/conf/GENERIC:1.557 Sun Jan 19 20:00:37 2020
+++ src/sys/arch/amd64/conf/GENERIC Mon Jan 20 18:38:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.557 2020/01/19 20:00:37 thorpej Exp $
+# $NetBSD: GENERIC,v 1.558 2020/01/20 18:38:19 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.557 $"
+#ident "GENERIC-$Revision: 1.558 $"
maxusers 64 # estimated number of users
@@ -794,7 +794,6 @@ ep* at pci? dev ? function ? # 3Com 3c59
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 90x[BC]
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.171 src/sys/arch/amd64/conf/XEN3_DOM0:1.172
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.171 Sun Jan 19 06:55:22 2020
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Mon Jan 20 18:38:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.171 2020/01/19 06:55:22 thorpej Exp $
+# $NetBSD: XEN3_DOM0,v 1.172 2020/01/20 18:38:19 thorpej Exp $
include "arch/amd64/conf/std.xen"
@@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOM0-$Revision: 1.171 $"
+#ident "XEN3_DOM0-$Revision: 1.172 $"
maxusers 32 # estimated number of users
@@ -342,7 +342,6 @@ ep* at pci? dev ? function ? # 3Com 3c59
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 90x[BC]
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ
Index: src/sys/arch/arc/conf/GENERIC
diff -u src/sys/arch/arc/conf/GENERIC:1.195 src/sys/arch/arc/conf/GENERIC:1.196
--- src/sys/arch/arc/conf/GENERIC:1.195 Sun Jan 19 06:55:22 2020
+++ src/sys/arch/arc/conf/GENERIC Mon Jan 20 18:38:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.195 2020/01/19 06:55:22 thorpej Exp $
+# $NetBSD: GENERIC,v 1.196 2020/01/20 18:38:19 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.195 $"
+#ident "GENERIC-$Revision: 1.196 $"
maxusers 32 # estimated number of users
@@ -320,7 +320,6 @@ bge* at pci? dev ? function ? # Broadco
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
ex* at pci? dev ? function ? # 3Com 90x[BC]
-#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
#hme* at pci? dev ? function ? # Sun STP2002-STQ
Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.175 src/sys/arch/cats/conf/GENERIC:1.176
--- src/sys/arch/cats/conf/GENERIC:1.175 Sun Jan 19 06:55:23 2020
+++ src/sys/arch/cats/conf/GENERIC Mon Jan 20 18:38:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.175 2020/01/19 06:55:23 thorpej Exp $
+# $NetBSD: GENERIC,v 1.176 2020/01/20 18:38:19 thorpej Exp $
#
# GENERIC machine description file
#
@@ -288,7 +288,6 @@ uk* at atapibus? drive ? flags 0x0000 #
ep* at pci? dev ? function ? # 3C590 ethernet cards
ex* at pci? dev ? function ? # 3Com 90x[B]
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
#le* at pci? dev ? function ? # PCnet-PCI Ethernet
ne* at pci? dev ? function ? # NE2000 compat ethernet
Index: src/sys/arch/cats/conf/INSTALL
diff -u src/sys/arch/cats/conf/INSTALL:1.112 src/sys/arch/cats/conf/INSTALL:1.113
--- src/sys/arch/cats/conf/INSTALL:1.112 Sun Jan 19 17:26:57 2020
+++ src/sys/arch/cats/conf/INSTALL Mon Jan 20 18:38:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.112 2020/01/19 17:26:57 thorpej Exp $
+# $NetBSD: INSTALL,v 1.113 2020/01/20 18:38:19 thorpej Exp $
#
# CATSINST -- CHALTECH CATS Install kernel
#
@@ -234,7 +234,6 @@ sd* at atapibus? drive ? flags 0x0000 #
ep* at pci? dev ? function ? # 3C590 ethernet cards
ex* at pci? dev ? function ? # 3Com 90x[B]
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
#le* at pci? dev ? function ? # PCnet-PCI Ethernet
ne* at pci? dev ? function ? # NE2000 compat ethernet
Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.164 src/sys/arch/cobalt/conf/GENERIC:1.165
--- src/sys/arch/cobalt/conf/GENERIC:1.164 Sun Jan 19 06:55:23 2020
+++ src/sys/arch/cobalt/conf/GENERIC Mon Jan 20 18:38:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.164 2020/01/19 06:55:23 thorpej Exp $
+# $NetBSD: GENERIC,v 1.165 2020/01/20 18:38:19 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.164 $"
+#ident "GENERIC-$Revision: 1.165 $"
maxusers 32
@@ -238,7 +238,6 @@ wd* at atabus? drive ? flags 0x0000
#ep* at pci? dev ? function ? # 3Com 3c59x
#ex* at pci? dev ? function ? # 3Com 90x[BC]
#epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
#fxp* at pci? dev ? function ? # Intel EtherExpress PRO10+/100B
#le* at pci? dev ? function ? # PCnet-PCI Ethernet
#ne* at pci? dev ? function ? # NE2000-compatible Ethernet
Index: src/sys/arch/cobalt/conf/INSTALL
diff -u src/sys/arch/cobalt/conf/INSTALL:1.72 src/sys/arch/cobalt/conf/INSTALL:1.73
--- src/sys/arch/cobalt/conf/INSTALL:1.72 Sun Jan 19 06:55:23 2020
+++ src/sys/arch/cobalt/conf/INSTALL Mon Jan 20 18:38:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.72 2020/01/19 06:55:23 thorpej Exp $
+# $NetBSD: INSTALL,v 1.73 2020/01/20 18:38:19 thorpej Exp $
#
# INSTALL -- installation and rescue kernel.
#
@@ -10,7 +10,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.72 $"
+#ident "INSTALL-$Revision: 1.73 $"
makeoptions COPTS="-Os -mmemcpy"
makeoptions CPUFLAGS="-march=vr5000 -mabi=32"
@@ -228,7 +228,6 @@ wd* at atabus? drive ? flags 0x0000
#ep* at pci? dev ? function ? # 3Com 3c59x
#ex* at pci? dev ? function ? # 3Com 90x[BC]
#epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
#fxp* at pci? dev ? function ? # Intel EtherExpress PRO10+/100B
#le* at pci? dev ? function ? # PCnet-PCI Ethernet
#ne* at pci? dev ? function ? # NE2000-compatible Ethernet
Index: src/sys/arch/evbarm/conf/IXDP425
diff -u src/sys/arch/evbarm/conf/IXDP425:1.57 src/sys/arch/evbarm/conf/IXDP425:1.58
--- src/sys/arch/evbarm/conf/IXDP425:1.57 Sun Jan 19 06:55:23 2020
+++ src/sys/arch/evbarm/conf/IXDP425 Mon Jan 20 18:38:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: IXDP425,v 1.57 2020/01/19 06:55:23 thorpej Exp $
+# $NetBSD: IXDP425,v 1.58 2020/01/20 18:38:20 thorpej Exp $
#
# IXDP425 -- Intel IXDP425/IXCDP1100 Development Platform
#
@@ -169,7 +169,6 @@ bge* at pci? dev ? function ? # Broadcom
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
ex* at pci? dev ? function ? # 3Com 90x[BC]
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
le* at pci? dev ? function ? # PCnet-PCI Ethernet
Index: src/sys/arch/evbarm/conf/ZAO425
diff -u src/sys/arch/evbarm/conf/ZAO425:1.65 src/sys/arch/evbarm/conf/ZAO425:1.66
--- src/sys/arch/evbarm/conf/ZAO425:1.65 Sun Jan 19 06:55:23 2020
+++ src/sys/arch/evbarm/conf/ZAO425 Mon Jan 20 18:38:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ZAO425,v 1.65 2020/01/19 06:55:23 thorpej Exp $
+# $NetBSD: ZAO425,v 1.66 2020/01/20 18:38:20 thorpej Exp $
#
# ZAO425 -- Intel IXP425
#
@@ -156,7 +156,6 @@ bge* at pci? dev ? function ? # Broadcom
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
ex* at pci? dev ? function ? # 3Com 90x[BC]
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
le* at pci? dev ? function ? # PCnet-PCI Ethernet
Index: src/sys/arch/evbmips/conf/MALTA
diff -u src/sys/arch/evbmips/conf/MALTA:1.98 src/sys/arch/evbmips/conf/MALTA:1.99
--- src/sys/arch/evbmips/conf/MALTA:1.98 Sun Jan 19 06:55:23 2020
+++ src/sys/arch/evbmips/conf/MALTA Mon Jan 20 18:38:20 2020
@@ -1,10 +1,10 @@
-# $NetBSD: MALTA,v 1.98 2020/01/19 06:55:23 thorpej Exp $
+# $NetBSD: MALTA,v 1.99 2020/01/20 18:38:20 thorpej Exp $
include "arch/evbmips/conf/std.malta"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MALTA-$Revision: 1.98 $"
+#ident "MALTA-$Revision: 1.99 $"
maxusers 32
@@ -217,7 +217,6 @@ ath* at pci? dev ? function ? # Atheros
#ep* at pci? dev ? function ? # 3Com 3c59x
#ex* at pci? dev ? function ? # 3Com 90x[B]
#epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
#fxp* at pci? dev ? function ? # Intel EtherExpress PRO10+/100B
#le* at pci? dev ? function ? # PCnet-PCI Ethernet
pcn* at pci? dev ? function ? # AMD PCnet-PCI Ethernet
Index: src/sys/arch/evbppc/conf/PMPPC
diff -u src/sys/arch/evbppc/conf/PMPPC:1.51 src/sys/arch/evbppc/conf/PMPPC:1.52
--- src/sys/arch/evbppc/conf/PMPPC:1.51 Sun Jan 19 06:55:23 2020
+++ src/sys/arch/evbppc/conf/PMPPC Mon Jan 20 18:38:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: PMPPC,v 1.51 2020/01/19 06:55:23 thorpej Exp $
+# $NetBSD: PMPPC,v 1.52 2020/01/20 18:38:20 thorpej Exp $
#
# PMPPC
#
@@ -230,7 +230,6 @@ an* at pci? dev ? function ? # Aironet P
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
ex* at pci? dev ? function ? # 3Com 90x[BC]
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
#hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ
Index: src/sys/arch/evbppc/conf/WALNUT
diff -u src/sys/arch/evbppc/conf/WALNUT:1.74 src/sys/arch/evbppc/conf/WALNUT:1.75
--- src/sys/arch/evbppc/conf/WALNUT:1.74 Wed Aug 1 20:04:11 2018
+++ src/sys/arch/evbppc/conf/WALNUT Mon Jan 20 18:38:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: WALNUT,v 1.74 2018/08/01 20:04:11 maxv Exp $
+# $NetBSD: WALNUT,v 1.75 2020/01/20 18:38:20 thorpej Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -133,7 +133,6 @@ pchb0 at plb? # PCI-Host bridges
pci* at pchb?
ppb* at pci? dev ? function ? # PCI-PCI bridges
-fpa* at pci? dev ? function ? # DEC PCI FDDI (DEFPA) Controller
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
ex* at pci? dev ? function ? # 3Com 90x[B]
Index: src/sys/arch/hppa/conf/GENERIC
diff -u src/sys/arch/hppa/conf/GENERIC:1.29 src/sys/arch/hppa/conf/GENERIC:1.30
--- src/sys/arch/hppa/conf/GENERIC:1.29 Sun Jan 19 06:55:23 2020
+++ src/sys/arch/hppa/conf/GENERIC Mon Jan 20 18:38:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.29 2020/01/19 06:55:23 thorpej Exp $
+# $NetBSD: GENERIC,v 1.30 2020/01/20 18:38:20 thorpej Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/hppa/conf/std.hppa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident "GENERIC-$Revision: 1.29 $"
+#ident "GENERIC-$Revision: 1.30 $"
maxusers 32 # estimated number of users
@@ -466,7 +466,6 @@ ep* at pci? dev ? function ? # 3Com 3c59
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
ex* at pci? dev ? function ? # 3Com 90x[BC]
# fpa is broken, does funky things with bus_dma
-#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
le* at pci? dev ? function ? # PCnet-PCI Ethernet
@@ -491,7 +490,6 @@ wm* at pci? dev ? function ? # Intel 825
# EISA network interfaces
ep* at eisa? slot ? # 3Com 3c579 Ethernet
-#fea* at eisa? slot ? # DEC DEFEA FDDI
tlp* at eisa? slot ? # DEC DE-425 Ethernet
#sh* at eisa? slot ? # Interphase Seahawk 4811 FDDI
#ie* at eisa? slot ? # Intel Ethernet
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.484 src/sys/arch/i386/conf/ALL:1.485
--- src/sys/arch/i386/conf/ALL:1.484 Sun Jan 19 20:41:18 2020
+++ src/sys/arch/i386/conf/ALL Mon Jan 20 18:38:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.484 2020/01/19 20:41:18 riastradh Exp $
+# $NetBSD: ALL,v 1.485 2020/01/20 18:38:20 thorpej 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.484 $"
+#ident "ALL-$Revision: 1.485 $"
maxusers 64 # estimated number of users
@@ -1058,7 +1058,6 @@ ep* at pci? dev ? function ? # 3Com 3c59
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 3c90x[BC]
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
@@ -1105,7 +1104,6 @@ xge* at pci? dev ? function ? # Neterion
# EISA network interfaces
ep* at eisa? slot ? # 3Com 3c579 Ethernet
-fea* at eisa? slot ? # DEC DEFEA FDDI
tlp* at eisa? slot ? # DEC DE-425 Ethernet
# ISA Plug-and-Play network interfaces
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1221 src/sys/arch/i386/conf/GENERIC:1.1222
--- src/sys/arch/i386/conf/GENERIC:1.1221 Sun Jan 19 20:00:37 2020
+++ src/sys/arch/i386/conf/GENERIC Mon Jan 20 18:38:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1221 2020/01/19 20:00:37 thorpej Exp $
+# $NetBSD: GENERIC,v 1.1222 2020/01/20 18:38:20 thorpej 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.1221 $"
+#ident "GENERIC-$Revision: 1.1222 $"
maxusers 64 # estimated number of users
@@ -973,7 +973,6 @@ ep* at pci? dev ? function ? # 3Com 3c59
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 3c90x[BC]
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ
@@ -1020,7 +1019,6 @@ xge* at pci? dev ? function ? # Neterion
# EISA network interfaces
ep* at eisa? slot ? # 3Com 3c579 Ethernet
-fea* at eisa? slot ? # DEC DEFEA FDDI
tlp* at eisa? slot ? # DEC DE-425 Ethernet
# ISA Plug-and-Play network interfaces
Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.165 src/sys/arch/i386/conf/GENERIC_TINY:1.166
--- src/sys/arch/i386/conf/GENERIC_TINY:1.165 Sun Jan 19 06:55:23 2020
+++ src/sys/arch/i386/conf/GENERIC_TINY Mon Jan 20 18:38:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.165 2020/01/19 06:55:23 thorpej Exp $
+# $NetBSD: GENERIC_TINY,v 1.166 2020/01/20 18:38:20 thorpej Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -365,7 +365,6 @@ fd* at fdc? drive ? # the drives thems
# PCI network interfaces
#ep* at pci? dev ? function ? # 3Com 3c59x/3c90x Ethernet
#epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
#fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
#le* at pci? dev ? function ? # PCnet-PCI Ethernet
#ne* at pci? dev ? function ? # NE2000-compatible Ethernet
@@ -374,7 +373,6 @@ fd* at fdc? drive ? # the drives thems
# EISA network interfaces
#ep* at eisa? slot ? # 3Com 3c579 Ethernet
-#fea* at eisa? slot ? # DEC DEFEA FDDI
# ISA Plug-and-Play network interfaces
#ep* at isapnp? # 3Com 3c509 Ethernet
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.52 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.53
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.52 Sun Jan 19 20:00:37 2020
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Mon Jan 20 18:38:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.52 2020/01/19 20:00:37 thorpej Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.53 2020/01/20 18:38:20 thorpej Exp $
#
# INSTALL - Installation kernel.
#
@@ -482,7 +482,6 @@ bge* at pci? dev ? function ? # Broadcom
ep* at pci? dev ? function ? # 3Com 3c59x
ex* at pci? dev ? function ? # 3Com 3c90x[BC]
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
#hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ
@@ -516,7 +515,6 @@ wm* at pci? dev ? function ? # Intel 825
# EISA network interfaces
ep* at eisa? slot ? # 3Com 3c579 Ethernet
-fea* at eisa? slot ? # DEC DEFEA FDDI
tlp* at eisa? slot ? # DEC DE-425 Ethernet
# ISA Plug-and-Play network interfaces
Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.160 src/sys/arch/i386/conf/INSTALL_TINY:1.161
--- src/sys/arch/i386/conf/INSTALL_TINY:1.160 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/i386/conf/INSTALL_TINY Mon Jan 20 18:38:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.160 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: INSTALL_TINY,v 1.161 2020/01/20 18:38:20 thorpej Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -381,7 +381,6 @@ fd* at fdc? drive ? # the drives thems
# PCI network interfaces
#ep* at pci? dev ? function ? # 3Com 3c59x/3c90x Ethernet
-#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
#fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
#le* at pci? dev ? function ? # PCnet-PCI Ethernet
#ne* at pci? dev ? function ? # NE2000-compatible Ethernet
@@ -390,7 +389,6 @@ fd* at fdc? drive ? # the drives thems
# EISA network interfaces
#ep* at eisa? slot ? # 3Com 3c579 Ethernet
-#fea* at eisa? slot ? # DEC DEFEA FDDI
# ISA Plug-and-Play network interfaces
#ep* at isapnp? # 3Com 3c509 Ethernet
Index: src/sys/arch/i386/conf/XEN3PAE_DOM0
diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.17 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.18
--- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.17 Sun Jan 19 06:55:23 2020
+++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Mon Jan 20 18:38:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOM0,v 1.17 2020/01/19 06:55:23 thorpej Exp $
+# $NetBSD: XEN3PAE_DOM0,v 1.18 2020/01/20 18:38:20 thorpej Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -323,7 +323,6 @@ ep* at pci? dev ? function ? # 3Com 3c59
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 3c90x[BC]
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ
Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.360 src/sys/arch/macppc/conf/GENERIC:1.361
--- src/sys/arch/macppc/conf/GENERIC:1.360 Fri Jan 10 06:26:34 2020
+++ src/sys/arch/macppc/conf/GENERIC Mon Jan 20 18:38:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.360 2020/01/10 06:26:34 macallan Exp $
+# $NetBSD: GENERIC,v 1.361 2020/01/20 18:38:20 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.360 $"
+#ident "GENERIC-$Revision: 1.361 $"
maxusers 32
@@ -203,7 +203,6 @@ bwi* at pci? dev ? function ? # Broadcom
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
ex* at pci? dev ? function ? # 3Com 90x[BC]
-fpa* at pci? dev ? function ? # DEC PCI FDDI (DEFPA) Controller
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gem* at pci? dev ? function ? # gmac ethernet
#gm* at pci? dev ? function ? # gmac ethernet (old)
Index: src/sys/arch/pmax/conf/GENERIC
diff -u src/sys/arch/pmax/conf/GENERIC:1.199 src/sys/arch/pmax/conf/GENERIC:1.200
--- src/sys/arch/pmax/conf/GENERIC:1.199 Fri Apr 26 21:40:31 2019
+++ src/sys/arch/pmax/conf/GENERIC Mon Jan 20 18:38:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.199 2019/04/26 21:40:31 sevan Exp $
+# $NetBSD: GENERIC,v 1.200 2020/01/20 18:38:21 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/pmax/conf/std.pmax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.199 $"
+#ident "GENERIC-$Revision: 1.200 $"
maxusers 64
@@ -215,7 +215,6 @@ pxg* at tc? slot ? offset ? # PMAG-D,E,F
xcfb* at tc? slot ? offset ? # PMAG-DV Color Framebuffer at MAXINE
asc* at tc? slot ? offset ? # PMAZ-A single channel SCSI
le* at tc? slot ? offset ? # PMAD-A LANCE
-fta* at tc? slot ? offset ? # PMAF-F FDDI
tcds* at tc? slot ? offset ? # PMAZB/PMAZC dual channel SCSI
asc* at tcds? chip ?
Index: src/sys/arch/pmax/conf/GENERIC64
diff -u src/sys/arch/pmax/conf/GENERIC64:1.32 src/sys/arch/pmax/conf/GENERIC64:1.33
--- src/sys/arch/pmax/conf/GENERIC64:1.32 Fri Apr 26 22:29:20 2019
+++ src/sys/arch/pmax/conf/GENERIC64 Mon Jan 20 18:38:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64,v 1.32 2019/04/26 22:29:20 sevan Exp $
+# $NetBSD: GENERIC64,v 1.33 2020/01/20 18:38:21 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/pmax/conf/std.pmax64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.32 $"
+#ident "GENERIC-$Revision: 1.33 $"
maxusers 64
@@ -205,7 +205,6 @@ pxg* at tc? slot ? offset ? # PMAG-D,E,F
xcfb* at tc? slot ? offset ? # PMAG-DV Color Framebuffer at MAXINE
asc* at tc? slot ? offset ? # PMAZ-A single channel SCSI
le* at tc? slot ? offset ? # PMAD-A LANCE
-fta* at tc? slot ? offset ? # PMAF-F FDDI
tcds* at tc? slot ? offset ? # PMAZB/PMAZC dual channel SCSI
asc* at tcds? chip ?
Index: src/sys/arch/pmax/conf/INSTALL
diff -u src/sys/arch/pmax/conf/INSTALL:1.74 src/sys/arch/pmax/conf/INSTALL:1.75
--- src/sys/arch/pmax/conf/INSTALL:1.74 Tue Dec 13 20:42:20 2016
+++ src/sys/arch/pmax/conf/INSTALL Mon Jan 20 18:38:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.74 2016/12/13 20:42:20 christos Exp $
+# $NetBSD: INSTALL,v 1.75 2020/01/20 18:38:21 thorpej Exp $
#
# Distribution install kernel (any model)
# netbsd: cut-down kernel for miniroots.
@@ -139,7 +139,6 @@ pxg* at tc? slot ? offset ? # PMAG-D,E,F
xcfb* at tc? slot ? offset ? # PMAG-DV Color Framebuffer at MAXINE
asc* at tc? slot ? offset ? # PMAZ-A single channel SCSI
le* at tc? slot ? offset ? # PMAD-A LANCE
-fta* at tc? slot ? offset ? # PMAF-F FDDI
tcds* at tc? slot ? offset ? # PMAZB/PMAZC dual channel SCSI
asc* at tcds? chip ?
Index: src/sys/arch/pmax/conf/INSTALL64
diff -u src/sys/arch/pmax/conf/INSTALL64:1.11 src/sys/arch/pmax/conf/INSTALL64:1.12
--- src/sys/arch/pmax/conf/INSTALL64:1.11 Tue Dec 13 20:42:20 2016
+++ src/sys/arch/pmax/conf/INSTALL64 Mon Jan 20 18:38:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL64,v 1.11 2016/12/13 20:42:20 christos Exp $
+# $NetBSD: INSTALL64,v 1.12 2020/01/20 18:38:21 thorpej Exp $
#
# Distribution install kernel (any model)
# netbsd: cut-down kernel for miniroots.
@@ -122,7 +122,6 @@ pxg* at tc? slot ? offset ? # PMAG-D,E,F
xcfb* at tc? slot ? offset ? # PMAG-DV Color Framebuffer at MAXINE
asc* at tc? slot ? offset ? # PMAZ-A single channel SCSI
le* at tc? slot ? offset ? # PMAD-A LANCE
-fta* at tc? slot ? offset ? # PMAF-F FDDI
tcds* at tc? slot ? offset ? # PMAZB/PMAZC dual channel SCSI
asc* at tcds? chip ?
Index: src/sys/arch/sgimips/conf/GENERIC32_IP3x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.128 src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.129
--- src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.128 Sun Jan 19 06:55:23 2020
+++ src/sys/arch/sgimips/conf/GENERIC32_IP3x Mon Jan 20 18:38:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP3x,v 1.128 2020/01/19 06:55:23 thorpej Exp $
+# $NetBSD: GENERIC32_IP3x,v 1.129 2020/01/20 18:38:21 thorpej Exp $
#
# GENERIC32_IP3x machine description file
#
@@ -28,7 +28,7 @@ makeoptions TEXTADDR="0x80069000" # entr
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32_IP3x-$Revision: 1.128 $"
+#ident "GENERIC32_IP3x-$Revision: 1.129 $"
maxusers 32
@@ -181,7 +181,6 @@ ubsec* at pci? dev ? function ? # Broadc
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
ex* at pci? dev ? function ? # 3Com 90x[BC]
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
#hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.221 src/sys/arch/sparc64/conf/GENERIC:1.222
--- src/sys/arch/sparc64/conf/GENERIC:1.221 Sun Jan 19 20:00:37 2020
+++ src/sys/arch/sparc64/conf/GENERIC Mon Jan 20 18:38:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.221 2020/01/19 20:00:37 thorpej Exp $
+# $NetBSD: GENERIC,v 1.222 2020/01/20 18:38:21 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.221 $"
+#ident "GENERIC-$Revision: 1.222 $"
maxusers 64
@@ -491,7 +491,6 @@ cas* at pci? dev ? function ? # Sun Cass
#ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
ex* at pci? dev ? function ? # 3Com 90x[B]
-fpa* at pci? dev ? function ? # DEC DEFPA FDDI UT
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet
gem* at sbus? slot ? offset ?
Index: src/sys/arch/vax/conf/GENERIC
diff -u src/sys/arch/vax/conf/GENERIC:1.211 src/sys/arch/vax/conf/GENERIC:1.212
--- src/sys/arch/vax/conf/GENERIC:1.211 Fri May 24 08:30:26 2019
+++ src/sys/arch/vax/conf/GENERIC Mon Jan 20 18:38:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.211 2019/05/24 08:30:26 msaitoh Exp $
+# $NetBSD: GENERIC,v 1.212 2020/01/20 18:38:21 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/vax/conf/std.vax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.211 $"
+#ident "GENERIC-$Revision: 1.212 $"
# Here are all different supported CPU types listed.
#options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800
@@ -196,7 +196,6 @@ tc0 at vsbus0 csr 0x36800000 # VS4000/6
tcds* at tc0 slot ? offset ? # TC dual SCSI controller
asc* at tcds? chip ? # PMAZB/C
asc* at tc? slot ? offset ? # PMAZ
-fta* at tc? slot ? offset ? # TC FDDI controller
le* at tc? slot ? offset ? # PMAD
hdc0 at vsbus0 csr 0x200c0000 # HDC9224 MFM/floppy ctlr
Index: src/sys/arch/vax/conf/INSTALL
diff -u src/sys/arch/vax/conf/INSTALL:1.74 src/sys/arch/vax/conf/INSTALL:1.75
--- src/sys/arch/vax/conf/INSTALL:1.74 Wed Apr 25 11:12:55 2018
+++ src/sys/arch/vax/conf/INSTALL Mon Jan 20 18:38:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.74 2018/04/25 11:12:55 ragge Exp $
+# $NetBSD: INSTALL,v 1.75 2020/01/20 18:38:21 thorpej Exp $
#
# INSTALL kernel; all supported devices but nothing fancy.
#
@@ -146,7 +146,6 @@ tc0 at vsbus0 csr 0x36800000 # VS4000/6
tcds* at tc0 slot ? offset ? # TC dual SCSI controller
asc* at tcds? chip ? # PMAZB/C
asc* at tc? slot ? offset ? # PMAZ
-fta* at tc? slot ? offset ? # TC FDDI controller
le* at tc? slot ? offset ? # PMAD
hdc0 at vsbus0 csr 0x200c0000 # HDC9224 MFM/floppy ctlr
Index: src/sys/arch/vax/conf/VAX780
diff -u src/sys/arch/vax/conf/VAX780:1.29 src/sys/arch/vax/conf/VAX780:1.30
--- src/sys/arch/vax/conf/VAX780:1.29 Fri Apr 26 22:46:04 2019
+++ src/sys/arch/vax/conf/VAX780 Mon Jan 20 18:38:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: VAX780,v 1.29 2019/04/26 22:46:04 sevan Exp $
+# $NetBSD: VAX780,v 1.30 2020/01/20 18:38:21 thorpej Exp $
#
# 11/780,750,730 machine description file
#
@@ -177,7 +177,6 @@ ubi0 at mainbus0 # 11/730 direct unibu
#tcds* at tc0 slot ? offset ? # TC dual SCSI controller
#asc* at tcds? chip ? # PMAZB/C
#asc* at tc? slot ? offset ? # PMAZ
-#fta* at tc? slot ? offset ? # TC FDDI controller
#le* at tc? slot ? offset ? # PMAD
#hdc0 at vsbus0 csr 0x200c0000 # HDC9224 MFM/floppy ctlr
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1252 src/sys/conf/files:1.1253
--- src/sys/conf/files:1.1252 Sun Jan 19 20:41:18 2020
+++ src/sys/conf/files Mon Jan 20 18:38:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1252 2020/01/19 20:41:18 riastradh Exp $
+# $NetBSD: files,v 1.1253 2020/01/20 18:38:21 thorpej Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -437,12 +437,10 @@ include "dev/splash/files.splash"
# videomode support
include "dev/videomode/files.videomode"
-# net device attributes - we have generic code for arc(net), ether(net),
-# and fddi
+# net device attributes
#
define arcnet
define ether
-define fddi
define ieee1394
define sppp
define wlan
@@ -781,12 +779,6 @@ define sunscpal
file dev/ic/sunscpal.c sunscpal
device ssc: scsi, sunscpal
-# DEC FDDI Chipset
-#
-define pdq
-file dev/ic/pdq.c pdq
-file dev/ic/pdq_ifsubr.c pdq
-
# Cyclades Cyclom-8/16/32
#
device cy: tty
Index: src/sys/dev/eisa/files.eisa
diff -u src/sys/dev/eisa/files.eisa:1.27 src/sys/dev/eisa/files.eisa:1.28
--- src/sys/dev/eisa/files.eisa:1.27 Sun Dec 11 12:21:20 2005
+++ src/sys/dev/eisa/files.eisa Mon Jan 20 18:38:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.eisa,v 1.27 2005/12/11 12:21:20 christos Exp $
+# $NetBSD: files.eisa,v 1.28 2020/01/20 18:38:17 thorpej Exp $
#
# Config file and device description for machine-independent EISA code.
# Included by ports that need it. Requires that the SCSI files be
@@ -49,11 +49,6 @@ file dev/eisa/depca_eisa.c depca_eisa
attach tlp at eisa with tlp_eisa
file dev/eisa/if_tlp_eisa.c tlp_eisa
-# DEC DEFEA EISA FDDI controller
-device fea: pdq, fddi, ifnet, arp
-attach fea at eisa
-file dev/eisa/if_fea.c fea
-
# Mylex RAID controllers
attach mlx at eisa with mlx_eisa
file dev/eisa/mlx_eisa.c mlx_eisa
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.423 src/sys/dev/pci/files.pci:1.424
--- src/sys/dev/pci/files.pci:1.423 Sun Jan 19 17:53:15 2020
+++ src/sys/dev/pci/files.pci Mon Jan 20 18:38:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.423 2020/01/19 17:53:15 thorpej Exp $
+# $NetBSD: files.pci,v 1.424 2020/01/20 18:38:17 thorpej Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -183,11 +183,6 @@ file dev/pci/if_ep_pci.c ep_pci
attach ex at pci with ex_pci
file dev/pci/if_ex_pci.c ex_pci
-# Digital DEFPA PCI FDDI Controller
-device fpa: pdq, fddi, ifnet, arp
-attach fpa at pci
-file dev/pci/if_fpa.c fpa
-
# AMD am7990 (LANCE) -based Ethernet controllers
# device declaration in sys/conf/files
attach le at pci with le_pci: le32
Index: src/sys/dev/tc/files.tc
diff -u src/sys/dev/tc/files.tc:1.35 src/sys/dev/tc/files.tc:1.36
--- src/sys/dev/tc/files.tc:1.35 Wed May 8 13:40:19 2019
+++ src/sys/dev/tc/files.tc Mon Jan 20 18:38:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.tc,v 1.35 2019/05/08 13:40:19 isaki Exp $
+# $NetBSD: files.tc,v 1.36 2020/01/20 18:38:17 thorpej Exp $
#
# Config file and device description for machine-independent
# TURBOchannel code. Included by ports that need it.
@@ -29,11 +29,6 @@ device bba: audiobus, am7930
attach bba at ioasic
file dev/tc/bba.c bba
-# DEFTA FDDI controller
-device fta: pdq, fddi, ifnet, arp
-attach fta at tc
-file dev/tc/if_fta.c fta
-
# TCDS dual channel SCSI
device tcds { chip = -1 }
attach tcds at tc
Index: src/sys/net/Makefile
diff -u src/sys/net/Makefile:1.40 src/sys/net/Makefile:1.41
--- src/sys/net/Makefile:1.40 Sun Jan 19 20:00:36 2020
+++ src/sys/net/Makefile Mon Jan 20 18:38:18 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2020/01/19 20:00:36 thorpej Exp $
+# $NetBSD: Makefile,v 1.41 2020/01/20 18:38:18 thorpej Exp $
INCSDIR= /usr/include/net
INCS= bpf.h bpfjit.h bpfdesc.h dlt.h ethertypes.h if.h if_arc.h if_arp.h \
- if_bridgevar.h if_dl.h if_ether.h if_fddi.h if_gif.h \
+ if_bridgevar.h if_dl.h if_ether.h if_gif.h \
if_gre.h if_ieee1394.h if_ipsec.h if_llc.h if_media.h if_mpls.h \
if_pflog.h if_ppp.h if_pppoe.h if_l2tp.h if_sppp.h if_srt.h if_stf.h \
if_tap.h if_tun.h if_types.h if_vlanvar.h net_stats.h \
Index: src/sys/net/files.net
diff -u src/sys/net/files.net:1.23 src/sys/net/files.net:1.24
--- src/sys/net/files.net:1.23 Sun Jan 19 20:00:36 2020
+++ src/sys/net/files.net Mon Jan 20 18:38:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.net,v 1.23 2020/01/19 20:00:36 thorpej Exp $
+# $NetBSD: files.net,v 1.24 2020/01/20 18:38:18 thorpej Exp $
# XXX CLEANUP
define net
@@ -12,10 +12,8 @@ file net/if.c net
file net/if_arcsubr.c arcnet needs-flag
file net/if_bridge.c bridge needs-flag
file net/bridgestp.c bridge
-file net/if_ethersubr.c ether | fddi | netatalk |
- wlan needs-flag
+file net/if_ethersubr.c ether | netatalk | wlan needs-flag
file net/if_faith.c faith & (inet | inet6) needs-flag
-file net/if_fddisubr.c fddi needs-flag
file net/if_gif.c gif needs-flag
file net/if_gre.c gre needs-flag
file net/if_ieee1394subr.c ieee1394
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.467 src/sys/net/if.c:1.468
--- src/sys/net/if.c:1.467 Sun Jan 19 20:00:36 2020
+++ src/sys/net/if.c Mon Jan 20 18:38:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.467 2020/01/19 20:00:36 thorpej Exp $ */
+/* $NetBSD: if.c,v 1.468 2020/01/20 18:38:18 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.467 2020/01/19 20:00:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.468 2020/01/20 18:38:18 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -149,7 +149,6 @@ __KERNEL_RCSID(0, "$NetBSD: if.c,v 1.467
#endif
#include "ether.h"
-#include "fddi.h"
#include "bridge.h"
#if NBRIDGE > 0
@@ -318,7 +317,7 @@ ifinit1(void)
if_pfil = pfil_head_create(PFIL_TYPE_IFNET, NULL);
KASSERT(if_pfil != NULL);
-#if NETHER > 0 || NFDDI > 0 || defined(NETATALK) || defined(WLAN)
+#if NETHER > 0 || defined(NETATALK) || defined(WLAN)
etherinit();
#endif
}
Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.290 src/sys/netinet/if_arp.c:1.291
--- src/sys/netinet/if_arp.c:1.290 Sun Jan 19 20:00:37 2020
+++ src/sys/netinet/if_arp.c Mon Jan 20 18:38:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.290 2020/01/19 20:00:37 thorpej Exp $ */
+/* $NetBSD: if_arp.c,v 1.291 2020/01/20 18:38:22 thorpej Exp $ */
/*
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.290 2020/01/19 20:00:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.291 2020/01/20 18:38:22 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -121,10 +121,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1
#if NARCNET > 0
#include <net/if_arc.h>
#endif
-#include "fddi.h"
-#if NFDDI > 0
-#include <net/if_fddi.h>
-#endif
#include "carp.h"
#if NCARP > 0
#include <netinet/ip_carp.h>
@@ -436,12 +432,6 @@ arp_rtrequest(int req, struct rtentry *r
* linklayers with particular link MTU limitation.
*/
switch(ifp->if_type) {
-#if NFDDI > 0
- case IFT_FDDI:
- if (ifp->if_mtu > FDDIIPMTU)
- rt->rt_rmx.rmx_mtu = FDDIIPMTU;
- break;
-#endif
#if NARCNET > 0
case IFT_ARCNET:
{
@@ -483,15 +473,6 @@ arp_rtrequest(int req, struct rtentry *r
* linklayers with particular link MTU limitation.
*/
switch (ifp->if_type) {
-#if NFDDI > 0
- case IFT_FDDI:
- if ((rt->rt_rmx.rmx_locks & RTV_MTU) == 0 &&
- (rt->rt_rmx.rmx_mtu > FDDIIPMTU ||
- (rt->rt_rmx.rmx_mtu == 0 &&
- ifp->if_mtu > FDDIIPMTU)))
- rt->rt_rmx.rmx_mtu = FDDIIPMTU;
- break;
-#endif
#if NARCNET > 0
case IFT_ARCNET:
{
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.106 src/sys/netinet/ip_carp.c:1.107
--- src/sys/netinet/ip_carp.c:1.106 Sun Jan 19 20:00:37 2020
+++ src/sys/netinet/ip_carp.c Mon Jan 20 18:38:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.106 2020/01/19 20:00:37 thorpej Exp $ */
+/* $NetBSD: ip_carp.c,v 1.107 2020/01/20 18:38:22 thorpej Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -33,7 +33,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.106 2020/01/19 20:00:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.107 2020/01/20 18:38:22 thorpej Exp $");
/*
* TODO:
@@ -74,10 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v
#include <netinet/if_inarp.h>
#include <netinet/wqinput.h>
-#if NFDDI > 0
-#include <net/if_fddi.h>
-#endif
-
#ifdef INET
#include <netinet/in.h>
#include <netinet/in_systm.h>
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.276 src/sys/netinet6/in6.c:1.277
--- src/sys/netinet6/in6.c:1.276 Wed Sep 25 09:53:38 2019
+++ src/sys/netinet6/in6.c Mon Jan 20 18:38:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.276 2019/09/25 09:53:38 ozaki-r Exp $ */
+/* $NetBSD: in6.c,v 1.277 2020/01/20 18:38:22 thorpej Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.276 2019/09/25 09:53:38 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.277 2020/01/20 18:38:22 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2395,8 +2395,6 @@ in6_if2idlen(struct ifnet *ifp)
case IFT_PROPVIRTUAL: /* XXX: no RFC. treat it as ether */
case IFT_L2VLAN: /* ditto */
case IFT_IEEE80211: /* ditto */
- case IFT_FDDI: /* RFC2467 */
- case IFT_ISO88025: /* RFC2470 (IPv6 over Token Ring) */
case IFT_PPP: /* RFC2472 */
case IFT_ARCNET: /* RFC2497 */
case IFT_FRELAY: /* RFC2590 */
Index: src/sys/netinet6/in6_ifattach.c
diff -u src/sys/netinet6/in6_ifattach.c:1.117 src/sys/netinet6/in6_ifattach.c:1.118
--- src/sys/netinet6/in6_ifattach.c:1.117 Fri Oct 18 04:33:53 2019
+++ src/sys/netinet6/in6_ifattach.c Mon Jan 20 18:38:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_ifattach.c,v 1.117 2019/10/18 04:33:53 ozaki-r Exp $ */
+/* $NetBSD: in6_ifattach.c,v 1.118 2020/01/20 18:38:22 thorpej Exp $ */
/* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.117 2019/10/18 04:33:53 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.118 2020/01/20 18:38:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -364,7 +364,6 @@ in6_get_hw_ifid(struct ifnet *ifp, struc
switch (ifp->if_type) {
/* IEEE802/EUI64 cases - what others? */
case IFT_ETHER:
- case IFT_FDDI:
case IFT_ATM:
case IFT_IEEE1394:
case IFT_IEEE80211:
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.265 src/sys/netinet6/nd6.c:1.266
--- src/sys/netinet6/nd6.c:1.265 Wed Sep 25 09:53:38 2019
+++ src/sys/netinet6/nd6.c Mon Jan 20 18:38:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.265 2019/09/25 09:53:38 ozaki-r Exp $ */
+/* $NetBSD: nd6.c,v 1.266 2020/01/20 18:38:22 thorpej Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.265 2019/09/25 09:53:38 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.266 2020/01/20 18:38:22 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -63,7 +63,6 @@ __KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.26
#include <net/if_types.h>
#include <net/route.h>
#include <net/if_ether.h>
-#include <net/if_fddi.h>
#include <net/if_arc.h>
#include <netinet/in.h>
@@ -222,9 +221,6 @@ nd6_setmtu0(struct ifnet *ifp, struct nd
case IFT_ARCNET:
ndi->maxmtu = MIN(ARC_PHDS_MAXMTU, ifp->if_mtu); /* RFC2497 */
break;
- case IFT_FDDI:
- ndi->maxmtu = MIN(FDDIIPMTU, ifp->if_mtu);
- break;
default:
ndi->maxmtu = ifp->if_mtu;
break;
@@ -2482,7 +2478,7 @@ nd6_need_cache(struct ifnet *ifp)
{
/*
* XXX: we currently do not make neighbor cache on any interface
- * other than ARCnet, Ethernet, FDDI and GIF.
+ * other than ARCnet, Ethernet, and GIF.
*
* RFC2893 says:
* - unidirectional tunnels needs no ND
@@ -2490,7 +2486,6 @@ nd6_need_cache(struct ifnet *ifp)
switch (ifp->if_type) {
case IFT_ARCNET:
case IFT_ETHER:
- case IFT_FDDI:
case IFT_IEEE1394:
case IFT_CARP:
case IFT_GIF: /* XXX need more cases? */
Index: src/sys/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.175 src/sys/netinet6/nd6_nbr.c:1.176
--- src/sys/netinet6/nd6_nbr.c:1.175 Wed Nov 13 02:51:22 2019
+++ src/sys/netinet6/nd6_nbr.c Mon Jan 20 18:38:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.175 2019/11/13 02:51:22 ozaki-r Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.176 2020/01/20 18:38:22 thorpej Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.175 2019/11/13 02:51:22 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.176 2020/01/20 18:38:22 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1089,7 +1089,6 @@ nd6_ifptomac(const struct ifnet *ifp)
switch (ifp->if_type) {
case IFT_ARCNET:
case IFT_ETHER:
- case IFT_FDDI:
case IFT_IEEE1394:
case IFT_PROPVIRTUAL:
case IFT_CARP:
@@ -1461,7 +1460,6 @@ nd6_dad_duplicated(struct ifaddr *ifa, s
*/
switch (ifp->if_type) {
case IFT_ETHER:
- case IFT_FDDI:
case IFT_ATM:
case IFT_IEEE1394:
case IFT_IEEE80211:
