svn commit: r332412 - in head: . lib/libifconfig sbin/etherswitchcfg sbin/ifconfig share/man/man4 sys/conf sys/dev/pdq sys/net sys/netinet sys/netinet6 sys/nfs
Alexander V. Chernikov
melifaro at ipfw.ru
Wed Apr 11 17:30:18 UTC 2018
11.04.2018, 20:28, "Brooks Davis" <brooks at freebsd.org>:
> Author: brooks
> Date: Wed Apr 11 17:28:24 2018
> New Revision: 332412
> URL: https://svnweb.freebsd.org/changeset/base/332412
>
> Log:
> Remove support for FDDI networks.
Awesome!
Thank you!
>
> Defines in net/if_media.h remain in case code copied from ifconfig is in
> use elsewere (supporting non-existant media type is harmless).
>
> Reviewed by: kib, jhb
> Sponsored by: DARPA, AFRL
> Differential Revision: https://reviews.freebsd.org/D15017
>
> Deleted:
> head/share/man/man4/fpa.4
> head/sys/dev/pdq/if_fpa.c
> head/sys/dev/pdq/pdq.c
> head/sys/dev/pdq/pdq_freebsd.h
> head/sys/dev/pdq/pdq_ifsubr.c
> head/sys/dev/pdq/pdqreg.h
> head/sys/dev/pdq/pdqvar.h
> head/sys/net/fddi.h
> head/sys/net/if_fddisubr.c
> Modified:
> head/ObsoleteFiles.inc
> head/UPDATING
> head/lib/libifconfig/libifconfig_media.c
> head/sbin/etherswitchcfg/ifmedia.c
> head/sbin/ifconfig/ifmedia.c
> head/share/man/man4/Makefile
> head/sys/conf/NOTES
> head/sys/conf/files
> head/sys/net/if.c
> head/sys/net/if_bridge.c
> head/sys/net/if_media.c
> head/sys/netinet/if_ether.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
>
> Modified: head/ObsoleteFiles.inc
> ==============================================================================
> --- head/ObsoleteFiles.inc Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/ObsoleteFiles.inc Wed Apr 11 17:28:24 2018 (r332412)
> @@ -38,6 +38,8 @@
> # xargs -n1 | sort | uniq -d;
> # done
>
> +# 20180409: remove FDDI support
> +OLD_FILES+=usr/include/net/fddi.h
> # 20180319: remove /boot/overlays, replaced by /boot/dtb/overlays
> OLD_DIRS+=boot/overlays
> # 20180311: remove sys/sys/i386/include/pcaudioio.h
>
> Modified: head/UPDATING
> ==============================================================================
> --- head/UPDATING Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/UPDATING Wed Apr 11 17:28:24 2018 (r332412)
> @@ -51,6 +51,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
>
> ****************************** SPECIAL WARNING: ******************************
>
> +20180411:
> + Support for FDDI networks has been removed. If you have device
> + fddi or device fpa in your kernel config file they must be
> + removed.
> +
> 20180406:
> In addition to supporting RFC 3164 formatted messages, the
> syslogd(8) service is now capable of parsing RFC 5424 formatted
>
> Modified: head/lib/libifconfig/libifconfig_media.c
> ==============================================================================
> --- head/lib/libifconfig/libifconfig_media.c Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/lib/libifconfig/libifconfig_media.c Wed Apr 11 17:28:24 2018 (r332412)
> @@ -86,15 +86,6 @@ static struct ifmedia_description ifm_subtype_tokenrin
> static struct ifmedia_description ifm_subtype_tokenring_option_descriptions[] =
> IFM_SUBTYPE_TOKENRING_OPTION_DESCRIPTIONS;
>
> -static struct ifmedia_description ifm_subtype_fddi_descriptions[] =
> - IFM_SUBTYPE_FDDI_DESCRIPTIONS;
> -
> -static struct ifmedia_description ifm_subtype_fddi_aliases[] =
> - IFM_SUBTYPE_FDDI_ALIASES;
> -
> -static struct ifmedia_description ifm_subtype_fddi_option_descriptions[] =
> - IFM_SUBTYPE_FDDI_OPTION_DESCRIPTIONS;
> -
> static struct ifmedia_description ifm_subtype_ieee80211_descriptions[] =
> IFM_SUBTYPE_IEEE80211_DESCRIPTIONS;
>
> @@ -182,24 +173,6 @@ static struct ifmedia_type_to_subtype ifmedia_types_to
> { &ifm_shared_option_descriptions[0], 0 },
> { &ifm_shared_option_aliases[0], 1 },
> { &ifm_subtype_tokenring_option_descriptions[0], 0 },
> - { NULL, 0 },
> - },
> - {
> - { NULL, 0 },
> - },
> - },
> - {
> - {
> - { &ifm_subtype_shared_descriptions[0], 0 },
> - { &ifm_subtype_shared_aliases[0], 1 },
> - { &ifm_subtype_fddi_descriptions[0], 0 },
> - { &ifm_subtype_fddi_aliases[0], 1 },
> - { NULL, 0 },
> - },
> - {
> - { &ifm_shared_option_descriptions[0], 0 },
> - { &ifm_shared_option_aliases[0], 1 },
> - { &ifm_subtype_fddi_option_descriptions[0], 0 },
> { NULL, 0 },
> },
> {
>
> Modified: head/sbin/etherswitchcfg/ifmedia.c
> ==============================================================================
> --- head/sbin/etherswitchcfg/ifmedia.c Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/sbin/etherswitchcfg/ifmedia.c Wed Apr 11 17:28:24 2018 (r332412)
> @@ -380,15 +380,6 @@ static struct ifmedia_description ifm_subtype_tokenrin
> static struct ifmedia_description ifm_subtype_tokenring_option_descriptions[] =
> IFM_SUBTYPE_TOKENRING_OPTION_DESCRIPTIONS;
>
> -static struct ifmedia_description ifm_subtype_fddi_descriptions[] =
> - IFM_SUBTYPE_FDDI_DESCRIPTIONS;
> -
> -static struct ifmedia_description ifm_subtype_fddi_aliases[] =
> - IFM_SUBTYPE_FDDI_ALIASES;
> -
> -static struct ifmedia_description ifm_subtype_fddi_option_descriptions[] =
> - IFM_SUBTYPE_FDDI_OPTION_DESCRIPTIONS;
> -
> static struct ifmedia_description ifm_subtype_ieee80211_descriptions[] =
> IFM_SUBTYPE_IEEE80211_DESCRIPTIONS;
>
> @@ -472,24 +463,6 @@ static struct ifmedia_type_to_subtype ifmedia_types_to
> { &ifm_shared_option_descriptions[0], 0 },
> { &ifm_shared_option_aliases[0], 1 },
> { &ifm_subtype_tokenring_option_descriptions[0], 0 },
> - { NULL, 0 },
> - },
> - {
> - { NULL, 0 },
> - },
> - },
> - {
> - {
> - { &ifm_subtype_shared_descriptions[0], 0 },
> - { &ifm_subtype_shared_aliases[0], 1 },
> - { &ifm_subtype_fddi_descriptions[0], 0 },
> - { &ifm_subtype_fddi_aliases[0], 1 },
> - { NULL, 0 },
> - },
> - {
> - { &ifm_shared_option_descriptions[0], 0 },
> - { &ifm_shared_option_aliases[0], 1 },
> - { &ifm_subtype_fddi_option_descriptions[0], 0 },
> { NULL, 0 },
> },
> {
>
> Modified: head/sbin/ifconfig/ifmedia.c
> ==============================================================================
> --- head/sbin/ifconfig/ifmedia.c Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/sbin/ifconfig/ifmedia.c Wed Apr 11 17:28:24 2018 (r332412)
> @@ -397,15 +397,6 @@ static struct ifmedia_description ifm_subtype_tokenrin
> static struct ifmedia_description ifm_subtype_tokenring_option_descriptions[] =
> IFM_SUBTYPE_TOKENRING_OPTION_DESCRIPTIONS;
>
> -static struct ifmedia_description ifm_subtype_fddi_descriptions[] =
> - IFM_SUBTYPE_FDDI_DESCRIPTIONS;
> -
> -static struct ifmedia_description ifm_subtype_fddi_aliases[] =
> - IFM_SUBTYPE_FDDI_ALIASES;
> -
> -static struct ifmedia_description ifm_subtype_fddi_option_descriptions[] =
> - IFM_SUBTYPE_FDDI_OPTION_DESCRIPTIONS;
> -
> static struct ifmedia_description ifm_subtype_ieee80211_descriptions[] =
> IFM_SUBTYPE_IEEE80211_DESCRIPTIONS;
>
> @@ -489,24 +480,6 @@ static struct ifmedia_type_to_subtype ifmedia_types_to
> { &ifm_shared_option_descriptions[0], 0 },
> { &ifm_shared_option_aliases[0], 1 },
> { &ifm_subtype_tokenring_option_descriptions[0], 0 },
> - { NULL, 0 },
> - },
> - {
> - { NULL, 0 },
> - },
> - },
> - {
> - {
> - { &ifm_subtype_shared_descriptions[0], 0 },
> - { &ifm_subtype_shared_aliases[0], 1 },
> - { &ifm_subtype_fddi_descriptions[0], 0 },
> - { &ifm_subtype_fddi_aliases[0], 1 },
> - { NULL, 0 },
> - },
> - {
> - { &ifm_shared_option_descriptions[0], 0 },
> - { &ifm_shared_option_aliases[0], 1 },
> - { &ifm_subtype_fddi_option_descriptions[0], 0 },
> { NULL, 0 },
> },
> {
>
> Modified: head/share/man/man4/Makefile
> ==============================================================================
> --- head/share/man/man4/Makefile Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/share/man/man4/Makefile Wed Apr 11 17:28:24 2018 (r332412)
> @@ -170,7 +170,6 @@ MAN= aac.4 \
> ffclock.4 \
> filemon.4 \
> firewire.4 \
> - fpa.4 \
> full.4 \
> fwe.4 \
> fwip.4 \
>
> Modified: head/sys/conf/NOTES
> ==============================================================================
> --- head/sys/conf/NOTES Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/sys/conf/NOTES Wed Apr 11 17:28:24 2018 (r332412)
> @@ -845,9 +845,6 @@ device wlan_xauth
> device wlan_acl
> device wlan_amrr
>
> -# The `fddi' device provides generic code to support FDDI.
> -device fddi
> -
> # The `arcnet' device provides generic code to support Arcnet.
> device arcnet
>
> @@ -1972,7 +1969,6 @@ device xmphy # XaQti XMAC II
> # ex: Intel EtherExpress Pro/10 and other i82595-based adapters,
> # Olicom Ethernet PC Card devices.
> # fe: Fujitsu MB86960A/MB86965A Ethernet
> -# fpa: Support for the Digital DEFPA PCI FDDI. `device fddi' is also needed.
> # fxp: Intel EtherExpress Pro/100B
> # (hint of prefer_iomap can be done to prefer I/O instead of Mem mapping)
> # gem: Apple GMAC/Sun ERI/Sun GEM
> @@ -2149,9 +2145,6 @@ device ti # Alteon Networks Tigon I/II gigabit Ether
> device txp # 3Com 3cR990 (``Typhoon'')
> device vx # 3Com 3c590, 3c595 (``Vortex'')
> device vxge # Exar/Neterion XFrame 3100 10GbE
> -
> -# PCI FDDI NICs.
> -device fpa
>
> # PCI WAN adapters.
> device lmc
>
> Modified: head/sys/conf/files
> ==============================================================================
> --- head/sys/conf/files Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/sys/conf/files Wed Apr 11 17:28:24 2018 (r332412)
> @@ -2642,9 +2642,6 @@ dev/pci/pcib_if.m standard
> dev/pci/pcib_support.c standard
> dev/pci/vga_pci.c optional pci
> dev/pcn/if_pcn.c optional pcn pci
> -dev/pdq/if_fpa.c optional fpa pci
> -dev/pdq/pdq.c optional nowerror fpa pci
> -dev/pdq/pdq_ifsubr.c optional nowerror fpa pci
> dev/pms/freebsd/driver/ini/src/agtiapi.c optional pmspcv \
> compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
> dev/pms/RefTisa/sallsdk/spc/sadisc.c optional pmspcv \
> @@ -4130,7 +4127,6 @@ net/if_edsc.c optional edsc
> net/if_enc.c optional enc inet | enc inet6
> net/if_epair.c optional epair
> net/if_ethersubr.c optional ether
> -net/if_fddisubr.c optional fddi
> net/if_fwsubr.c optional fwip
> net/if_gif.c optional gif inet | gif inet6 | \
> netgraph_gif inet | netgraph_gif inet6
>
> Modified: head/sys/net/if.c
> ==============================================================================
> --- head/sys/net/if.c Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/sys/net/if.c Wed Apr 11 17:28:24 2018 (r332412)
> @@ -3692,7 +3692,6 @@ if_setlladdr(struct ifnet *ifp, const u_char *lladdr,
> }
> switch (ifp->if_type) {
> case IFT_ETHER:
> - case IFT_FDDI:
> case IFT_XETHER:
> case IFT_L2VLAN:
> case IFT_BRIDGE:
>
> Modified: head/sys/net/if_bridge.c
> ==============================================================================
> --- head/sys/net/if_bridge.c Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/sys/net/if_bridge.c Wed Apr 11 17:28:24 2018 (r332412)
> @@ -72,8 +72,8 @@
> *
> * - Currently only supports Ethernet-like interfaces (Ethernet,
> * 802.11, VLANs on Ethernet, etc.) Figure out a nice way
> - * to bridge other types of interfaces (FDDI-FDDI, and maybe
> - * consider heterogeneous bridges).
> + * to bridge other types of interfaces (maybe consider
> + * heterogeneous bridges).
> */
>
> #include <sys/cdefs.h>
>
> Modified: head/sys/net/if_media.c
> ==============================================================================
> --- head/sys/net/if_media.c Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/sys/net/if_media.c Wed Apr 11 17:28:24 2018 (r332412)
> @@ -405,12 +405,6 @@ struct ifmedia_description ifm_subtype_tokenring_descr
> struct ifmedia_description ifm_subtype_tokenring_option_descriptions[] =
> IFM_SUBTYPE_TOKENRING_OPTION_DESCRIPTIONS;
>
> -struct ifmedia_description ifm_subtype_fddi_descriptions[] =
> - IFM_SUBTYPE_FDDI_DESCRIPTIONS;
> -
> -struct ifmedia_description ifm_subtype_fddi_option_descriptions[] =
> - IFM_SUBTYPE_FDDI_OPTION_DESCRIPTIONS;
> -
> struct ifmedia_description ifm_subtype_ieee80211_descriptions[] =
> IFM_SUBTYPE_IEEE80211_DESCRIPTIONS;
>
> @@ -448,11 +442,6 @@ struct ifmedia_type_to_subtype ifmedia_types_to_subtyp
> {
> &ifm_subtype_tokenring_descriptions[0],
> &ifm_subtype_tokenring_option_descriptions[0],
> - NULL,
> - },
> - {
> - &ifm_subtype_fddi_descriptions[0],
> - &ifm_subtype_fddi_option_descriptions[0],
> NULL,
> },
> {
>
> Modified: head/sys/netinet/if_ether.c
> ==============================================================================
> --- head/sys/netinet/if_ether.c Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/sys/netinet/if_ether.c Wed Apr 11 17:28:24 2018 (r332412)
> @@ -694,10 +694,6 @@ arpintr(struct mbuf *m)
> hlen = ETHER_ADDR_LEN; /* RFC 826 */
> layer = "ethernet";
> break;
> - case ARPHRD_IEEE802:
> - hlen = 6; /* RFC 1390, FDDI_ADDR_LEN */
> - layer = "fddi";
> - break;
> case ARPHRD_ARCNET:
> hlen = 1; /* RFC 1201, ARC_ADDR_LEN */
> layer = "arcnet";
>
> Modified: head/sys/netinet/ip_carp.c
> ==============================================================================
> --- head/sys/netinet/ip_carp.c Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/sys/netinet/ip_carp.c Wed Apr 11 17:28:24 2018 (r332412)
> @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
> #include <sys/counter.h>
>
> #include <net/ethernet.h>
> -#include <net/fddi.h>
> #include <net/if.h>
> #include <net/if_var.h>
> #include <net/if_dl.h>
> @@ -1526,18 +1525,6 @@ carp_output(struct ifnet *ifp, struct mbuf *m, const s
> eh->ether_shost[5] = sc->sc_vhid;
> }
> break;
> - case IFT_FDDI: {
> - struct fddi_header *fh;
> -
> - fh = mtod(m, struct fddi_header *);
> - fh->fddi_shost[0] = 0;
> - fh->fddi_shost[1] = 0;
> - fh->fddi_shost[2] = 0x5e;
> - fh->fddi_shost[3] = 0;
> - fh->fddi_shost[4] = 1;
> - fh->fddi_shost[5] = sc->sc_vhid;
> - }
> - break;
> default:
> printf("%s: carp is not supported for the %d interface type\n",
> ifp->if_xname, ifp->if_type);
> @@ -1719,7 +1706,6 @@ carp_ioctl(struct ifreq *ifr, u_long cmd, struct threa
> case IFT_ETHER:
> case IFT_L2VLAN:
> case IFT_BRIDGE:
> - case IFT_FDDI:
> break;
> default:
> error = EOPNOTSUPP;
>
> Modified: head/sys/netinet6/in6.c
> ==============================================================================
> --- head/sys/netinet6/in6.c Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/sys/netinet6/in6.c Wed Apr 11 17:28:24 2018 (r332412)
> @@ -1972,8 +1972,6 @@ in6_if2idlen(struct ifnet *ifp)
> case IFT_BRIDGE: /* bridge(4) only does Ethernet-like links */
> case IFT_INFINIBAND:
> return (64);
> - case IFT_FDDI: /* RFC2467 */
> - 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 Apr 11 17:26:53 2018 (r332411)
> +++ head/sys/netinet6/in6_ifattach.c Wed Apr 11 17:28:24 2018 (r332412)
> @@ -274,7 +274,6 @@ found:
> case IFT_BRIDGE:
> case IFT_ETHER:
> case IFT_L2VLAN:
> - case IFT_FDDI:
> case IFT_ATM:
> case IFT_IEEE1394:
> /* IEEE802/EUI64 cases - what others? */
>
> Modified: head/sys/netinet6/nd6.c
> ==============================================================================
> --- head/sys/netinet6/nd6.c Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/sys/netinet6/nd6.c Wed Apr 11 17:28:24 2018 (r332412)
> @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
> #include <net/if_arc.h>
> #include <net/if_dl.h>
> #include <net/if_types.h>
> -#include <net/fddi.h>
> #include <net/route.h>
> #include <net/vnet.h>
>
> @@ -340,9 +339,6 @@ nd6_setmtu0(struct ifnet *ifp, struct nd_ifinfo *ndi)
> case IFT_ARCNET:
> ndi->maxmtu = MIN(ARC_PHDS_MAXMTU, ifp->if_mtu); /* RFC2497 */
> break;
> - case IFT_FDDI:
> - ndi->maxmtu = MIN(FDDIIPMTU, ifp->if_mtu); /* RFC2467 */
> - break;
> default:
> ndi->maxmtu = ifp->if_mtu;
> break;
> @@ -2272,7 +2268,6 @@ nd6_resolve(struct ifnet *ifp, int is_gw, struct mbuf
> if (m != NULL && m->m_flags & M_MCAST) {
> switch (ifp->if_type) {
> case IFT_ETHER:
> - case IFT_FDDI:
> case IFT_L2VLAN:
> case IFT_BRIDGE:
> ETHER_MAP_IPV6_MULTICAST(&dst6->sin6_addr,
> @@ -2524,7 +2519,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
> @@ -2532,7 +2527,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_L2VLAN:
> case IFT_INFINIBAND:
>
> Modified: head/sys/netinet6/nd6_nbr.c
> ==============================================================================
> --- head/sys/netinet6/nd6_nbr.c Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/sys/netinet6/nd6_nbr.c Wed Apr 11 17:28:24 2018 (r332412)
> @@ -1092,7 +1092,6 @@ nd6_ifptomac(struct ifnet *ifp)
> switch (ifp->if_type) {
> case IFT_ARCNET:
> case IFT_ETHER:
> - case IFT_FDDI:
> case IFT_IEEE1394:
> case IFT_L2VLAN:
> case IFT_INFINIBAND:
> @@ -1466,7 +1465,6 @@ nd6_dad_duplicated(struct ifaddr *ifa, struct dadq *dp
> */
> switch (ifp->if_type) {
> case IFT_ETHER:
> - case IFT_FDDI:
> case IFT_ATM:
> case IFT_IEEE1394:
> case IFT_INFINIBAND:
>
> Modified: head/sys/nfs/bootp_subr.c
> ==============================================================================
> --- head/sys/nfs/bootp_subr.c Wed Apr 11 17:26:53 2018 (r332411)
> +++ head/sys/nfs/bootp_subr.c Wed Apr 11 17:28:24 2018 (r332412)
> @@ -1645,7 +1645,6 @@ bootpc_init(void)
> continue;
> switch (ifp->if_alloctype) {
> case IFT_ETHER:
> - case IFT_FDDI:
> break;
> default:
> continue;
> @@ -1675,7 +1674,6 @@ retry:
> continue;
> switch (ifp->if_alloctype) {
> case IFT_ETHER:
> - case IFT_FDDI:
> break;
> default:
> continue;
More information about the svn-src-all
mailing list