Module Name: src
Committed By: thorpej
Date: Sun Jan 19 20:00:38 UTC 2020
Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/share/man/man4: Makefile
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/evbarm/conf: LUBBOCK MPCSA_GENERIC TWINTAIL
src/sys/arch/evbppc/conf: OPENBLOCKS266_OPT
src/sys/arch/i386/conf: ALL GENERIC GENERIC_PS2TINY INSTALL_FLOPPY
src/sys/arch/sparc64/conf: GENERIC
src/sys/conf: files
src/sys/dev/isa: files.isa
src/sys/dev/isapnp: files.isapnp
src/sys/dev/mca: files.mca
src/sys/dev/pcmcia: files.pcmcia
src/sys/net: Makefile files.net if.c
src/sys/netinet: if_arp.c ip_carp.c
Removed Files:
src/share/man/man4: tr.4
src/sys/dev/ic: tropic.c tropicreg.h tropicvar.h
src/sys/dev/isa: if_tr_isa.c if_tribm_isa.c if_trtcm_isa.c
src/sys/dev/isapnp: if_tr_isapnp.c
src/sys/dev/mca: if_tr_mca.c
src/sys/dev/pcmcia: if_tr_pcmcia.c
src/sys/net: if_token.h if_tokensubr.c
Log Message:
Remove Token Ring support.
To generate a diff of this commit:
cvs rdiff -u -r1.2302 -r1.2303 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1672 -r1.1673 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.696 -r1.697 src/share/man/man4/Makefile
cvs rdiff -u -r1.15 -r0 src/share/man/man4/tr.4
cvs rdiff -u -r1.138 -r1.139 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.556 -r1.557 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/evbarm/conf/LUBBOCK
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/evbarm/conf/TWINTAIL
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
cvs rdiff -u -r1.482 -r1.483 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1220 -r1.1221 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/i386/conf/GENERIC_PS2TINY
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.220 -r1.221 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.1250 -r1.1251 src/sys/conf/files
cvs rdiff -u -r1.53 -r0 src/sys/dev/ic/tropic.c
cvs rdiff -u -r1.6 -r0 src/sys/dev/ic/tropicreg.h
cvs rdiff -u -r1.14 -r0 src/sys/dev/ic/tropicvar.h
cvs rdiff -u -r1.174 -r1.175 src/sys/dev/isa/files.isa
cvs rdiff -u -r1.26 -r0 src/sys/dev/isa/if_tr_isa.c
cvs rdiff -u -r1.14 -r0 src/sys/dev/isa/if_tribm_isa.c
cvs rdiff -u -r1.20 -r0 src/sys/dev/isa/if_trtcm_isa.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/isapnp/files.isapnp
cvs rdiff -u -r1.22 -r0 src/sys/dev/isapnp/if_tr_isapnp.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/mca/files.mca
cvs rdiff -u -r1.24 -r0 src/sys/dev/mca/if_tr_mca.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pcmcia/files.pcmcia
cvs rdiff -u -r1.29 -r0 src/sys/dev/pcmcia/if_tr_pcmcia.c
cvs rdiff -u -r1.39 -r1.40 src/sys/net/Makefile
cvs rdiff -u -r1.22 -r1.23 src/sys/net/files.net
cvs rdiff -u -r1.466 -r1.467 src/sys/net/if.c
cvs rdiff -u -r1.17 -r0 src/sys/net/if_token.h
cvs rdiff -u -r1.84 -r0 src/sys/net/if_tokensubr.c
cvs rdiff -u -r1.289 -r1.290 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.105 -r1.106 src/sys/netinet/ip_carp.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.2302 src/distrib/sets/lists/comp/mi:1.2303
--- src/distrib/sets/lists/comp/mi:1.2302 Sun Jan 19 10:50:25 2020
+++ src/distrib/sets/lists/comp/mi Sun Jan 19 20:00:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2302 2020/01/19 10:50:25 martin Exp $
+# $NetBSD: mi,v 1.2303 2020/01/19 20:00:36 thorpej Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -2366,7 +2366,7 @@
./usr/include/net/if_stf.h comp-c-include
./usr/include/net/if_stripvar.h comp-obsolete obsolete
./usr/include/net/if_tap.h comp-c-include
-./usr/include/net/if_token.h comp-c-include
+./usr/include/net/if_token.h comp-obsolete obsolete
./usr/include/net/if_tun.h comp-c-include
./usr/include/net/if_types.h comp-c-include
./usr/include/net/if_vlanvar.h comp-c-include
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1672 src/distrib/sets/lists/man/mi:1.1673
--- src/distrib/sets/lists/man/mi:1.1672 Sun Jan 19 17:53:15 2020
+++ src/distrib/sets/lists/man/mi Sun Jan 19 20:00:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1672 2020/01/19 17:53:15 thorpej Exp $
+# $NetBSD: mi,v 1.1673 2020/01/19 20:00:36 thorpej Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1845,7 +1845,7 @@
./usr/share/man/cat4/tprof.0 man-sys-catman .cat
./usr/share/man/cat4/tps65217pmic.0 man-sys-catman .cat
./usr/share/man/cat4/tqphy.0 man-sys-catman .cat
-./usr/share/man/cat4/tr.0 man-sys-catman .cat
+./usr/share/man/cat4/tr.0 man-obsolete obsolete
./usr/share/man/cat4/tra.0 man-sys-catman .cat
./usr/share/man/cat4/trm.0 man-sys-catman .cat
./usr/share/man/cat4/tsllux.0 man-sys-catman .cat
@@ -4955,7 +4955,7 @@
./usr/share/man/html4/tprof.html man-sys-htmlman html
./usr/share/man/html4/tps65217pmic.html man-sys-htmlman html
./usr/share/man/html4/tqphy.html man-sys-htmlman html
-./usr/share/man/html4/tr.html man-sys-htmlman html
+./usr/share/man/html4/tr.html man-obsolete obsolete
./usr/share/man/html4/tra.html man-sys-htmlman html
./usr/share/man/html4/trm.html man-sys-htmlman html
./usr/share/man/html4/tsllux.html man-sys-htmlman html
@@ -7985,7 +7985,7 @@
./usr/share/man/man4/tprof.4 man-sys-man .man
./usr/share/man/man4/tps65217pmic.4 man-sys-man .man
./usr/share/man/man4/tqphy.4 man-sys-man .man
-./usr/share/man/man4/tr.4 man-sys-man .man
+./usr/share/man/man4/tr.4 man-obsolete obsolete
./usr/share/man/man4/tra.4 man-sys-man .man
./usr/share/man/man4/trm.4 man-sys-man .man
./usr/share/man/man4/tsllux.4 man-sys-man .man
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.696 src/share/man/man4/Makefile:1.697
--- src/share/man/man4/Makefile:1.696 Sun Jan 19 17:53:15 2020
+++ src/share/man/man4/Makefile Sun Jan 19 20:00:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.696 2020/01/19 17:53:15 thorpej Exp $
+# $NetBSD: Makefile,v 1.697 2020/01/19 20:00:35 thorpej Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -63,7 +63,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a
ssdfb.4 st.4 ste.4 stge.4 sti.4 stpcide.4 sv.4 \
svwsata.4 swsensor.4 swwdog.4 sysmon.4 \
tap.4 tc.4 tcds.4 tcp.4 tcu.4 tdvfb.4 tea5767radio.4 termios.4 tfb.4 \
- thinkpad.4 ti.4 tl.4 tlp.4 tlphy.4 tpm.4 tprof.4 tr.4 tra.4 \
+ thinkpad.4 ti.4 tl.4 tlp.4 tlphy.4 tpm.4 tprof.4 tra.4 \
trm.4 tsllux.4 tty.4 tun.4 tqphy.4 twa.4 twe.4 txp.4 \
uark.4 ubsec.4 udp.4 uep.4 ug.4 uha.4 uk.4 ukphy.4 umb.4 \
unix.4 userconf.4 \
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.138 src/sys/arch/amd64/conf/ALL:1.139
--- src/sys/arch/amd64/conf/ALL:1.138 Sun Jan 19 06:55:22 2020
+++ src/sys/arch/amd64/conf/ALL Sun Jan 19 20:00:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.138 2020/01/19 06:55:22 thorpej Exp $
+# $NetBSD: ALL,v 1.139 2020/01/19 20:00:37 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.138 $"
+#ident "ALL-$Revision: 1.139 $"
maxusers 64 # estimated number of users
@@ -1036,8 +1036,6 @@ mbe* at pcmcia? function ? # MB8696x ba
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-# tr at pcmcia has problems with Cardbus bridges
-tr* at pcmcia? function ? # TROPIC based Token-Ring
wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
@@ -1069,9 +1067,6 @@ le* at bicc?
ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
ne1 at isa? port 0x300 irq 10
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
-tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
-tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.556 src/sys/arch/amd64/conf/GENERIC:1.557
--- src/sys/arch/amd64/conf/GENERIC:1.556 Sun Jan 19 06:55:22 2020
+++ src/sys/arch/amd64/conf/GENERIC Sun Jan 19 20:00:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.556 2020/01/19 06:55:22 thorpej Exp $
+# $NetBSD: GENERIC,v 1.557 2020/01/19 20:00:37 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.556 $"
+#ident "GENERIC-$Revision: 1.557 $"
maxusers 64 # estimated number of users
@@ -852,8 +852,6 @@ mbe* at pcmcia? function ? # MB8696x ba
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-# tr at pcmcia has problems with Cardbus bridges
-#tr* at pcmcia? function ? # TROPIC based Token-Ring
wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
Index: src/sys/arch/evbarm/conf/LUBBOCK
diff -u src/sys/arch/evbarm/conf/LUBBOCK:1.60 src/sys/arch/evbarm/conf/LUBBOCK:1.61
--- src/sys/arch/evbarm/conf/LUBBOCK:1.60 Thu Sep 14 07:58:40 2017
+++ src/sys/arch/evbarm/conf/LUBBOCK Sun Jan 19 20:00:37 2020
@@ -213,7 +213,6 @@ mbe* at pcmcia? function ? # MB8696x ba
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-tr* at pcmcia? function ? # TROPIC based Token-Ring
wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.68 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.69
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.68 Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC Sun Jan 19 20:00:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.68 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.69 2020/01/19 20:00:37 thorpej 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.68 $"
+#ident "GENERIC-$Revision: 1.69 $"
maxusers 32 # estimated number of users
@@ -370,8 +370,6 @@ sd* at atapibus? drive ? flags 0x0000 #
#ne* at pcmcia? function ? # NE2000-compatible Ethernet
#ray* at pcmcia? function ? # Raytheon Raylink (802.11)
#sm* at pcmcia? function ? # Megahertz Ethernet
-# tr at pcmcia has problems with Cardbus bridges
-#tr* at pcmcia? function ? # TROPIC based Token-Ring
wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
#xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
#com* at xirc?
Index: src/sys/arch/evbarm/conf/TWINTAIL
diff -u src/sys/arch/evbarm/conf/TWINTAIL:1.76 src/sys/arch/evbarm/conf/TWINTAIL:1.77
--- src/sys/arch/evbarm/conf/TWINTAIL:1.76 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/evbarm/conf/TWINTAIL Sun Jan 19 20:00:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: TWINTAIL,v 1.76 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: TWINTAIL,v 1.77 2020/01/19 20:00:37 thorpej Exp $
#
# TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
#
@@ -325,8 +325,6 @@ mbe* at pcmcia? function ? # MB8696x ba
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-# tr at pcmcia has problems with Cardbus bridges
-tr* at pcmcia? function ? # TROPIC based Token-Ring
wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
Index: src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.27 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.28
--- src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.27 Sat Apr 13 08:22:59 2019
+++ src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT Sun Jan 19 20:00:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS266_OPT,v 1.27 2019/04/13 08:22:59 isaki Exp $
+# $NetBSD: OPENBLOCKS266_OPT,v 1.28 2020/01/19 20:00:37 thorpej Exp $
#
include "arch/evbppc/conf/OPENBLOCKS266"
@@ -77,8 +77,6 @@ mbe* at pcmcia? function ? # MB8696x ba
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-# tr at pcmcia has problems with Cardbus bridges
-#tr* at pcmcia? function ? # TROPIC based Token-Ring
wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.482 src/sys/arch/i386/conf/ALL:1.483
--- src/sys/arch/i386/conf/ALL:1.482 Sun Jan 19 06:55:23 2020
+++ src/sys/arch/i386/conf/ALL Sun Jan 19 20:00:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.482 2020/01/19 06:55:23 thorpej Exp $
+# $NetBSD: ALL,v 1.483 2020/01/19 20:00:37 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.482 $"
+#ident "ALL-$Revision: 1.483 $"
maxusers 64 # estimated number of users
@@ -1115,7 +1115,6 @@ ep* at isapnp? # 3Com 3c509 Ethernet
fmv* at isapnp? # Fujitsu FMV-183
le* at isapnp? # AMD PCnet-ISA Ethernet
ne* at isapnp? # NE2000-compatible Ethernet
-tr* at isapnp? # IBM/3Com TROPIC Token-Ring
# PCMCIA network interfaces
an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11)
@@ -1128,8 +1127,6 @@ mbe* at pcmcia? function ? # MB8696x ba
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-# tr at pcmcia has problems with Cardbus bridges
-tr* at pcmcia? function ? # TROPIC based Token-Ring
wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
@@ -1161,9 +1158,6 @@ le* at bicc?
ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
ne1 at isa? port 0x300 irq 10
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
-tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
-tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10
@@ -1187,7 +1181,6 @@ ep* at mca? slot ? # 3Com EtherLink II
we* at mca? slot ? # WD/SMC Ethernet
ate* at mca? slot ? # Allied Telesis AT1720
ne* at mca? slot ? # Novell NE/2 and clones
-tr* at mca? slot ? # IBM Token Ring adapter
tra* at mca? slot ? # Tiara LANCard/E and clones
le* at mca? slot ? # SKNET Personal/MC2+
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1220 src/sys/arch/i386/conf/GENERIC:1.1221
--- src/sys/arch/i386/conf/GENERIC:1.1220 Sun Jan 19 06:55:23 2020
+++ src/sys/arch/i386/conf/GENERIC Sun Jan 19 20:00:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1220 2020/01/19 06:55:23 thorpej Exp $
+# $NetBSD: GENERIC,v 1.1221 2020/01/19 20:00:37 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.1220 $"
+#ident "GENERIC-$Revision: 1.1221 $"
maxusers 64 # estimated number of users
@@ -1029,7 +1029,6 @@ ep* at isapnp? # 3Com 3c509 Ethernet
fmv* at isapnp? # Fujitsu FMV-183
le* at isapnp? # AMD PCnet-ISA Ethernet
ne* at isapnp? # NE2000-compatible Ethernet
-tr* at isapnp? # IBM/3Com TROPIC Token-Ring
# PCMCIA network interfaces
an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11)
@@ -1042,8 +1041,6 @@ mbe* at pcmcia? function ? # MB8696x ba
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-# tr at pcmcia has problems with Cardbus bridges
-#tr* at pcmcia? function ? # TROPIC based Token-Ring
wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
@@ -1075,9 +1072,6 @@ le* at bicc?
ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
ne1 at isa? port 0x300 irq 10
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
-tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
-tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10
@@ -1101,7 +1095,6 @@ ep* at mca? slot ? # 3Com EtherLink II
we* at mca? slot ? # WD/SMC Ethernet
ate* at mca? slot ? # Allied Telesis AT1720
ne* at mca? slot ? # Novell NE/2 and clones
-tr* at mca? slot ? # IBM Token Ring adapter
tra* at mca? slot ? # Tiara LANCard/E and clones
le* at mca? slot ? # SKNET Personal/MC2+
Index: src/sys/arch/i386/conf/GENERIC_PS2TINY
diff -u src/sys/arch/i386/conf/GENERIC_PS2TINY:1.80 src/sys/arch/i386/conf/GENERIC_PS2TINY:1.81
--- src/sys/arch/i386/conf/GENERIC_PS2TINY:1.80 Wed Aug 1 16:59:09 2018
+++ src/sys/arch/i386/conf/GENERIC_PS2TINY Sun Jan 19 20:00:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_PS2TINY,v 1.80 2018/08/01 16:59:09 maxv Exp $
+# $NetBSD: GENERIC_PS2TINY,v 1.81 2020/01/19 20:00:37 thorpej Exp $
#
# GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains
# IBM PS/2 related stuff and has been generally trimmed down somewhat,
@@ -177,7 +177,6 @@ ep* at mca? slot ? # 3Com EtherLink II
we* at mca? slot ? # WD/SMC Ethernet
ate* at mca? slot ? # Allied Telesis AT1720
ne* at mca? slot ? # Novell NE/2 and clones
-tr* at mca? slot ? # IBM Token Ring adapter
tra* at mca? slot ? # Tiara LANCard/E and clones
le* at mca? slot ? # SKNET Personal/MC2+
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.51 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.52
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.51 Sun Jan 19 06:55:23 2020
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Sun Jan 19 20:00:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.51 2020/01/19 06:55:23 thorpej Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.52 2020/01/19 20:00:37 thorpej Exp $
#
# INSTALL - Installation kernel.
#
@@ -525,7 +525,6 @@ ep* at isapnp? # 3Com 3c509 Ethernet
fmv* at isapnp? # Fujitsu FMV-183
le* at isapnp? # AMD PCnet-ISA Ethernet
ne* at isapnp? # NE2000-compatible Ethernet
-tr* at isapnp? # IBM/3Com TROPIC Token-Ring
# PCMCIA network interfaces
an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11)
@@ -568,9 +567,6 @@ le* at bicc?
ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
ne1 at isa? port 0x300 irq 10
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
-tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
-tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.220 src/sys/arch/sparc64/conf/GENERIC:1.221
--- src/sys/arch/sparc64/conf/GENERIC:1.220 Sun Jan 19 06:55:24 2020
+++ src/sys/arch/sparc64/conf/GENERIC Sun Jan 19 20:00:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.220 2020/01/19 06:55:24 thorpej Exp $
+# $NetBSD: GENERIC,v 1.221 2020/01/19 20:00:37 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.220 $"
+#ident "GENERIC-$Revision: 1.221 $"
maxusers 64
@@ -796,8 +796,6 @@ pseudo-device stf # 6to4 IPv6 over IPv
#ne* at pcmcia? function ? # NE2000-compatible Ethernet
#ray* at pcmcia? function ? # Raytheon Raylink (802.11) UT
#sm* at pcmcia? function ? # Megahertz Ethernet UT
-# tr at pcmcia has problems with Cardbus bridges
-#tr* at pcmcia? function ? # TROPIC based Token-Ring UT
#wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
#xirc* at pcmcia? function ? # Xircom CreditCard Ethernet UT
#com* at xirc?
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1250 src/sys/conf/files:1.1251
--- src/sys/conf/files:1.1250 Sun Jan 19 06:55:24 2020
+++ src/sys/conf/files Sun Jan 19 20:00:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1250 2020/01/19 06:55:24 thorpej Exp $
+# $NetBSD: files,v 1.1251 2020/01/19 20:00:37 thorpej Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -438,14 +438,12 @@ include "dev/splash/files.splash"
include "dev/videomode/files.videomode"
# net device attributes - we have generic code for arc(net), ether(net),
-# fddi, and token ring.
+# and fddi
#
define arcnet
define ether
define fddi
-define hippi
define ieee1394
-define token
define sppp
define wlan
define crypto
@@ -771,11 +769,6 @@ file dev/ic/dp83905.c dp83905
define mx98905
file dev/ic/mx98905.c mx98905
-# TROPIC Token-Ring controller
-#
-device tr: arp, token, ifnet
-file dev/ic/tropic.c tr
-
# NCR 5380 SCSI Bus Controller
#
define ncr5380sbc
Index: src/sys/dev/isa/files.isa
diff -u src/sys/dev/isa/files.isa:1.174 src/sys/dev/isa/files.isa:1.175
--- src/sys/dev/isa/files.isa:1.174 Fri Oct 25 17:39:57 2019
+++ src/sys/dev/isa/files.isa Sun Jan 19 20:00:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.isa,v 1.174 2019/10/25 17:39:57 martin Exp $
+# $NetBSD: files.isa,v 1.175 2020/01/19 20:00:35 thorpej Exp $
#
# Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
@@ -270,13 +270,6 @@ device ix: ether, ifnet, arp, i82586
attach ix at isa
file dev/isa/if_ix.c ix
-# TROPIC based Token-Ring (IBM/3COM)
-define tr_isa
-file dev/isa/if_tr_isa.c tr_isa
-attach tr at isa with tr_isa: tr_isa, elink
-file dev/isa/if_tribm_isa.c tr_isa
-file dev/isa/if_trtcm_isa.c tr_isa
-
#
# ISA Sound hardware
#
Index: src/sys/dev/isapnp/files.isapnp
diff -u src/sys/dev/isapnp/files.isapnp:1.39 src/sys/dev/isapnp/files.isapnp:1.40
--- src/sys/dev/isapnp/files.isapnp:1.39 Sat Sep 22 16:22:23 2018
+++ src/sys/dev/isapnp/files.isapnp Sun Jan 19 20:00:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.isapnp,v 1.39 2018/09/22 16:22:23 maxv Exp $
+# $NetBSD: files.isapnp,v 1.40 2020/01/19 20:00:36 thorpej Exp $
#
# Config file and device description for machine-independent ISAPnP code.
# Included by ports that need it.
@@ -30,10 +30,6 @@ file dev/isapnp/if_le_isapnp.c le_isapn
attach ne at isapnp with ne_isapnp: rtl80x9
file dev/isapnp/if_ne_isapnp.c ne_isapnp
-# TROPIC based Token-Ring (IBM/3COM)
-attach tr at isapnp with tr_isapnp
-file dev/isapnp/if_tr_isapnp.c tr_isapnp
-
# Aironet 802.11 ISA
attach an at isapnp with an_isapnp
file dev/isapnp/if_an_isapnp.c an_isapnp
Index: src/sys/dev/mca/files.mca
diff -u src/sys/dev/mca/files.mca:1.22 src/sys/dev/mca/files.mca:1.23
--- src/sys/dev/mca/files.mca:1.22 Sun Dec 11 12:22:18 2005
+++ src/sys/dev/mca/files.mca Sun Jan 19 20:00:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.mca,v 1.22 2005/12/11 12:22:18 christos Exp $
+# $NetBSD: files.mca,v 1.23 2020/01/19 20:00:36 thorpej Exp $
#
# Config.new file and device description for machine-independent MCA code.
# Included by ports that need it.
@@ -24,10 +24,6 @@ file dev/mca/if_we_mca.c we_mca
attach aha at mca with aha_mca
file dev/mca/aha_mca.c aha_mca
-# TROPIC based Token-Ring (IBM)
-attach tr at mca with tr_mca
-file dev/mca/if_tr_mca.c tr_mca
-
# 3Com 3C523
device elmc: ether, ifnet, arp, i82586
attach elmc at mca with elmc_mca
Index: src/sys/dev/pcmcia/files.pcmcia
diff -u src/sys/dev/pcmcia/files.pcmcia:1.59 src/sys/dev/pcmcia/files.pcmcia:1.60
--- src/sys/dev/pcmcia/files.pcmcia:1.59 Sat Sep 22 16:22:23 2018
+++ src/sys/dev/pcmcia/files.pcmcia Sun Jan 19 20:00:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.pcmcia,v 1.59 2018/09/22 16:22:23 maxv Exp $
+# $NetBSD: files.pcmcia,v 1.60 2020/01/19 20:00:36 thorpej Exp $
#
# Config.new file and device description for machine-independent PCMCIA code.
# Included by ports that need it.
@@ -103,10 +103,6 @@ file dev/pcmcia/xirc.c xirc | com_xirc
needs-flag
file dev/pcmcia/if_xi.c xi
-# IBM Tropic-based Token Ring cards
-attach tr at pcmcia with tr_pcmcia
-file dev/pcmcia/if_tr_pcmcia.c tr_pcmcia
-
# Crystal Semiconductor CS8920 based cards
attach cs at pcmcia with cs_pcmcia
file dev/pcmcia/if_cs_pcmcia.c cs_pcmcia
Index: src/sys/net/Makefile
diff -u src/sys/net/Makefile:1.39 src/sys/net/Makefile:1.40
--- src/sys/net/Makefile:1.39 Sun Jan 19 06:55:21 2020
+++ src/sys/net/Makefile Sun Jan 19 20:00:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2020/01/19 06:55:21 thorpej Exp $
+# $NetBSD: Makefile,v 1.40 2020/01/19 20:00:36 thorpej Exp $
INCSDIR= /usr/include/net
@@ -6,7 +6,7 @@ INCS= bpf.h bpfjit.h bpfdesc.h dlt.h eth
if_bridgevar.h if_dl.h if_ether.h if_fddi.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_token.h if_tun.h if_types.h if_vlanvar.h net_stats.h \
+ if_tap.h if_tun.h if_types.h if_vlanvar.h net_stats.h \
netisr.h pfil.h pfkeyv2.h pfvar.h ppp-comp.h ppp_defs.h radix.h \
raw_cb.h route.h slcompress.h slip.h zlib.h
Index: src/sys/net/files.net
diff -u src/sys/net/files.net:1.22 src/sys/net/files.net:1.23
--- src/sys/net/files.net:1.22 Sun Jan 19 06:55:21 2020
+++ src/sys/net/files.net Sun Jan 19 20:00:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.net,v 1.22 2020/01/19 06:55:21 thorpej Exp $
+# $NetBSD: files.net,v 1.23 2020/01/19 20:00:36 thorpej Exp $
# XXX CLEANUP
define net
@@ -12,7 +12,7 @@ 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 | token |
+file net/if_ethersubr.c ether | fddi | netatalk |
wlan needs-flag
file net/if_faith.c faith & (inet | inet6) needs-flag
file net/if_fddisubr.c fddi needs-flag
@@ -30,7 +30,6 @@ file net/if_srt.c srt
file net/if_stf.c stf & inet & inet6 needs-flag
file net/if_sl.c sl needs-flag
file net/if_spppsubr.c sppp
-file net/if_tokensubr.c token needs-flag
file net/if_tap.c tap
file net/if_tun.c tun
file net/if_vlan.c vlan needs-flag
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.466 src/sys/net/if.c:1.467
--- src/sys/net/if.c:1.466 Tue Dec 17 04:54:36 2019
+++ src/sys/net/if.c Sun Jan 19 20:00:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.466 2019/12/17 04:54:36 christos Exp $ */
+/* $NetBSD: if.c,v 1.467 2020/01/19 20:00:36 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.466 2019/12/17 04:54:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.467 2020/01/19 20:00:36 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -150,7 +150,6 @@ __KERNEL_RCSID(0, "$NetBSD: if.c,v 1.466
#include "ether.h"
#include "fddi.h"
-#include "token.h"
#include "bridge.h"
#if NBRIDGE > 0
@@ -319,7 +318,7 @@ ifinit1(void)
if_pfil = pfil_head_create(PFIL_TYPE_IFNET, NULL);
KASSERT(if_pfil != NULL);
-#if NETHER > 0 || NFDDI > 0 || defined(NETATALK) || NTOKEN > 0 || defined(WLAN)
+#if NETHER > 0 || NFDDI > 0 || defined(NETATALK) || defined(WLAN)
etherinit();
#endif
}
Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.289 src/sys/netinet/if_arp.c:1.290
--- src/sys/netinet/if_arp.c:1.289 Fri Oct 11 13:32:46 2019
+++ src/sys/netinet/if_arp.c Sun Jan 19 20:00:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.289 2019/10/11 13:32:46 roy Exp $ */
+/* $NetBSD: if_arp.c,v 1.290 2020/01/19 20:00:37 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.289 2019/10/11 13:32:46 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.290 2020/01/19 20:00:37 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -105,7 +105,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1
#include <net/ethertypes.h>
#include <net/if.h>
#include <net/if_dl.h>
-#include <net/if_token.h>
#include <net/if_types.h>
#include <net/if_ether.h>
#include <net/if_llatbl.h>
@@ -126,7 +125,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1
#if NFDDI > 0
#include <net/if_fddi.h>
#endif
-#include "token.h"
#include "carp.h"
#if NCARP > 0
#include <netinet/ip_carp.h>
@@ -180,9 +178,6 @@ static void arp_dad_stop(struct ifaddr *
static void arp_dad_duplicated(struct ifaddr *, const struct sockaddr_dl *);
static void arp_init_llentry(struct ifnet *, struct llentry *);
-#if NTOKEN > 0
-static void arp_free_llentry_tokenring(struct llentry *);
-#endif
struct ifqueue arpintrq = {
.ifq_head = NULL,
@@ -408,25 +403,12 @@ arp_init_llentry(struct ifnet *ifp, stru
{
switch (ifp->if_type) {
-#if NTOKEN > 0
- case IFT_ISO88025:
- lle->la_opaque = kmem_intr_alloc(sizeof(struct token_rif),
- KM_NOSLEEP);
- lle->lle_ll_free = arp_free_llentry_tokenring;
+ default:
+ /* Nothing. */
break;
-#endif
}
}
-#if NTOKEN > 0
-static void
-arp_free_llentry_tokenring(struct llentry *lle)
-{
-
- kmem_intr_free(lle->la_opaque, sizeof(struct token_rif));
-}
-#endif
-
/*
* Parallel to llc_rtrequest.
*/
@@ -1237,34 +1219,6 @@ in_arpinput(struct mbuf *m)
KASSERT(ifp->if_sadl->sdl_alen == ifp->if_addrlen);
-#if NTOKEN > 0
- /*
- * XXX uses m_data and assumes the complete answer including
- * XXX token-ring headers is in the same buf
- */
- if (ifp->if_type == IFT_ISO88025) {
- struct token_header *trh;
-
- trh = (struct token_header *)M_TRHSTART(m);
- if (trh->token_shost[0] & TOKEN_RI_PRESENT) {
- struct token_rif *rif;
- size_t riflen;
-
- rif = TOKEN_RIF(trh);
- riflen = (ntohs(rif->tr_rcf) &
- TOKEN_RCF_LEN_MASK) >> 8;
-
- if (riflen > 2 &&
- riflen < sizeof(struct token_rif) &&
- (riflen & 1) == 0) {
- rif->tr_rcf ^= htons(TOKEN_RCF_DIRECTION);
- rif->tr_rcf &= htons(~TOKEN_RCF_BROADCAST_MASK);
- memcpy(TOKEN_RIF_LLE(la), rif, riflen);
- }
- }
- }
-#endif
-
KASSERT(sizeof(la->ll_addr) >= ifp->if_addrlen);
memcpy(&la->ll_addr, ar_sha(ah), ifp->if_addrlen);
la->la_flags |= LLE_VALID;
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.105 src/sys/netinet/ip_carp.c:1.106
--- src/sys/netinet/ip_carp.c:1.105 Thu Jan 16 12:56:40 2020
+++ src/sys/netinet/ip_carp.c Sun Jan 19 20:00:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.105 2020/01/16 12:56:40 kardel Exp $ */
+/* $NetBSD: ip_carp.c,v 1.106 2020/01/19 20:00:37 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.105 2020/01/16 12:56:40 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.106 2020/01/19 20:00:37 thorpej Exp $");
/*
* TODO:
@@ -77,9 +77,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v
#if NFDDI > 0
#include <net/if_fddi.h>
#endif
-#if NTOKEN > 0
-#include <net/if_token.h>
-#endif
#ifdef INET
#include <netinet/in.h>
