svn commit: r331714 - in head: . sys/conf sys/net sys/netinet sys/netinet6 sys/nfs usr.sbin/arp
Brooks Davis
brooks at FreeBSD.org
Wed Mar 28 23:33:28 UTC 2018
Author: brooks
Date: Wed Mar 28 23:33:26 2018
New Revision: 331714
URL: https://svnweb.freebsd.org/changeset/base/331714
Log:
Remove infrastructure for token-ring networks.
Reviewed by: cem, imp, jhb, jmallett
Relnotes: yes
Sponsored by: DARPA, AFRL
Differential Revision: https://reviews.freebsd.org/D14875
Deleted:
head/sys/net/if_iso88025subr.c
head/sys/net/iso88025.h
Modified:
head/UPDATING
head/sys/conf/NOTES
head/sys/conf/files
head/sys/net/if.c
head/sys/netinet/ip_carp.c
head/sys/netinet6/in6.c
head/sys/netinet6/in6_ifattach.c
head/sys/netinet6/nd6.c
head/sys/netinet6/nd6_nbr.c
head/sys/nfs/bootp_subr.c
head/usr.sbin/arp/arp.c
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Wed Mar 28 23:17:29 2018 (r331713)
+++ head/UPDATING Wed Mar 28 23:33:26 2018 (r331714)
@@ -51,6 +51,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
****************************** SPECIAL WARNING: ******************************
+20180528:
+ Support for token ring networks has been removed. If you
+ have "device token" in your kernel config you should remove
+ it. No device drivers supported token ring.
+
20180323:
makefs was modified to be able to tag ISO9660 El Torito boot catalog
entries as EFI instead of overloading the i386 tag as done previously.
Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES Wed Mar 28 23:17:29 2018 (r331713)
+++ head/sys/conf/NOTES Wed Mar 28 23:33:26 2018 (r331714)
@@ -807,7 +807,7 @@ device loop
# The `ether' device provides generic code to handle
# Ethernets; it is MANDATORY when an Ethernet device driver is
-# configured or token-ring is enabled.
+# configured.
device ether
# The `vlan' device implements the VLAN tagging of Ethernet frames
@@ -845,9 +845,6 @@ device wlan_xauth
# The 'wlan_amrr' device provides AMRR transmit rate control algorithm
device wlan_acl
device wlan_amrr
-
-# Generic TokenRing
-device token
# The `fddi' device provides generic code to support FDDI.
device fddi
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Wed Mar 28 23:17:29 2018 (r331713)
+++ head/sys/conf/files Wed Mar 28 23:33:26 2018 (r331714)
@@ -4114,7 +4114,6 @@ net/if_gif.c optional gif inet | gif inet6 | \
netgraph_gif inet | netgraph_gif inet6
net/if_gre.c optional gre inet | gre inet6
net/if_ipsec.c optional inet ipsec | inet6 ipsec
-net/if_iso88025subr.c optional token
net/if_lagg.c optional lagg
net/if_loop.c optional loop
net/if_llatbl.c standard
Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c Wed Mar 28 23:17:29 2018 (r331713)
+++ head/sys/net/if.c Wed Mar 28 23:33:26 2018 (r331714)
@@ -3626,7 +3626,6 @@ if_setlladdr(struct ifnet *ifp, const u_char *lladdr,
case IFT_ETHER:
case IFT_FDDI:
case IFT_XETHER:
- case IFT_ISO88025:
case IFT_L2VLAN:
case IFT_BRIDGE:
case IFT_ARCNET:
Modified: head/sys/netinet/ip_carp.c
==============================================================================
--- head/sys/netinet/ip_carp.c Wed Mar 28 23:17:29 2018 (r331713)
+++ head/sys/netinet/ip_carp.c Wed Mar 28 23:33:26 2018 (r331714)
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
#include <net/if_dl.h>
#include <net/if_llatbl.h>
#include <net/if_types.h>
-#include <net/iso88025.h>
#include <net/route.h>
#include <net/vnet.h>
@@ -1539,17 +1538,6 @@ carp_output(struct ifnet *ifp, struct mbuf *m, const s
fh->fddi_shost[5] = sc->sc_vhid;
}
break;
- case IFT_ISO88025: {
- struct iso88025_header *th;
- th = mtod(m, struct iso88025_header *);
- th->iso88025_shost[0] = 3;
- th->iso88025_shost[1] = 0;
- th->iso88025_shost[2] = 0x40 >> (sc->sc_vhid - 1);
- th->iso88025_shost[3] = 0x40000 >> (sc->sc_vhid - 1);
- th->iso88025_shost[4] = 0;
- th->iso88025_shost[5] = 0;
- }
- break;
default:
printf("%s: carp is not supported for the %d interface type\n",
ifp->if_xname, ifp->if_type);
@@ -1732,7 +1720,6 @@ carp_ioctl(struct ifreq *ifr, u_long cmd, struct threa
case IFT_L2VLAN:
case IFT_BRIDGE:
case IFT_FDDI:
- case IFT_ISO88025:
break;
default:
error = EOPNOTSUPP;
Modified: head/sys/netinet6/in6.c
==============================================================================
--- head/sys/netinet6/in6.c Wed Mar 28 23:17:29 2018 (r331713)
+++ head/sys/netinet6/in6.c Wed Mar 28 23:33:26 2018 (r331714)
@@ -1971,8 +1971,6 @@ in6_if2idlen(struct ifnet *ifp)
return (64);
case IFT_FDDI: /* RFC2467 */
return (64);
- case IFT_ISO88025: /* RFC2470 (IPv6 over Token Ring) */
- return (64);
case IFT_PPP: /* RFC2472 */
return (64);
case IFT_ARCNET: /* RFC2497 */
Modified: head/sys/netinet6/in6_ifattach.c
==============================================================================
--- head/sys/netinet6/in6_ifattach.c Wed Mar 28 23:17:29 2018 (r331713)
+++ head/sys/netinet6/in6_ifattach.c Wed Mar 28 23:33:26 2018 (r331714)
@@ -275,7 +275,6 @@ found:
case IFT_ETHER:
case IFT_L2VLAN:
case IFT_FDDI:
- case IFT_ISO88025:
case IFT_ATM:
case IFT_IEEE1394:
/* IEEE802/EUI64 cases - what others? */
Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c Wed Mar 28 23:17:29 2018 (r331713)
+++ head/sys/netinet6/nd6.c Wed Mar 28 23:33:26 2018 (r331714)
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
#include <net/if_arc.h>
#include <net/if_dl.h>
#include <net/if_types.h>
-#include <net/iso88025.h>
#include <net/fddi.h>
#include <net/route.h>
#include <net/vnet.h>
@@ -344,9 +343,6 @@ nd6_setmtu0(struct ifnet *ifp, struct nd_ifinfo *ndi)
case IFT_FDDI:
ndi->maxmtu = MIN(FDDIIPMTU, ifp->if_mtu); /* RFC2467 */
break;
- case IFT_ISO88025:
- ndi->maxmtu = MIN(ISO88025_MAX_MTU, ifp->if_mtu);
- break;
default:
ndi->maxmtu = ifp->if_mtu;
break;
@@ -2279,7 +2275,6 @@ nd6_resolve(struct ifnet *ifp, int is_gw, struct mbuf
case IFT_FDDI:
case IFT_L2VLAN:
case IFT_BRIDGE:
- case IFT_ISO88025:
ETHER_MAP_IPV6_MULTICAST(&dst6->sin6_addr,
desten);
return (0);
Modified: head/sys/netinet6/nd6_nbr.c
==============================================================================
--- head/sys/netinet6/nd6_nbr.c Wed Mar 28 23:17:29 2018 (r331713)
+++ head/sys/netinet6/nd6_nbr.c Wed Mar 28 23:33:26 2018 (r331714)
@@ -1097,7 +1097,6 @@ nd6_ifptomac(struct ifnet *ifp)
case IFT_L2VLAN:
case IFT_INFINIBAND:
case IFT_BRIDGE:
- case IFT_ISO88025:
return IF_LLADDR(ifp);
default:
return NULL;
Modified: head/sys/nfs/bootp_subr.c
==============================================================================
--- head/sys/nfs/bootp_subr.c Wed Mar 28 23:17:29 2018 (r331713)
+++ head/sys/nfs/bootp_subr.c Wed Mar 28 23:33:26 2018 (r331714)
@@ -1646,7 +1646,6 @@ bootpc_init(void)
switch (ifp->if_alloctype) {
case IFT_ETHER:
case IFT_FDDI:
- case IFT_ISO88025:
break;
default:
continue;
@@ -1677,7 +1676,6 @@ retry:
switch (ifp->if_alloctype) {
case IFT_ETHER:
case IFT_FDDI:
- case IFT_ISO88025:
break;
default:
continue;
Modified: head/usr.sbin/arp/arp.c
==============================================================================
--- head/usr.sbin/arp/arp.c Wed Mar 28 23:17:29 2018 (r331713)
+++ head/usr.sbin/arp/arp.c Wed Mar 28 23:33:26 2018 (r331714)
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
#include <net/if_dl.h>
#include <net/if_types.h>
#include <net/route.h>
-#include <net/iso88025.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
@@ -303,7 +302,6 @@ valid_type(int type)
case IFT_INFINIBAND:
case IFT_ISO88023:
case IFT_ISO88024:
- case IFT_ISO88025:
case IFT_L2VLAN:
case IFT_BRIDGE:
return (1);
@@ -592,9 +590,7 @@ print_entry(struct sockaddr_dl *sdl,
{
const char *host;
struct hostent *hp;
- struct iso88025_sockaddr_dl_data *trld;
struct if_nameindex *p;
- int seg;
if (ifnameindex == NULL)
if ((ifnameindex = if_nameindex()) == NULL)
@@ -659,17 +655,6 @@ print_entry(struct sockaddr_dl *sdl,
case IFT_ETHER:
xo_emit(" [{:type/ethernet}]");
break;
- case IFT_ISO88025:
- xo_emit(" [{:type/token-ring}]");
- trld = SDL_ISO88025(sdl);
- if (trld->trld_rcf != 0) {
- xo_emit(" rt=%x", ntohs(trld->trld_rcf));
- for (seg = 0;
- seg < ((TR_RCF_RIFLEN(trld->trld_rcf) - 2 ) / 2);
- seg++)
- xo_emit(":%x", ntohs(*(trld->trld_route[seg])));
- }
- break;
case IFT_FDDI:
xo_emit(" [{:type/fddi}]");
break;
More information about the svn-src-all
mailing list