aboutsummaryrefslogtreecommitdiff
path: root/sbin/etherswitchcfg/ifmedia.c
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2018-04-23 21:10:33 +0000
committerBrooks Davis <brooks@FreeBSD.org>2018-04-23 21:10:33 +0000
commit4204224162bed8605ea05f2797af69d5c636e9bb (patch)
treebf43ade279233a46210cbc135c14d3f7d09088b3 /sbin/etherswitchcfg/ifmedia.c
parent7b7796eea50fb8beb0ea5dd53c0aa07103498442 (diff)
downloadsrc-4204224162bed8605ea05f2797af69d5c636e9bb.tar.gz
src-4204224162bed8605ea05f2797af69d5c636e9bb.zip
Finish removing FDDI and tokenring media support.
This fixes media display for 802.11 wireless devices. Software outside the base system that uses these media types and defines should use #ifdef IFM_FDDI or IFM_TOKEN to include or remove support. Reported by: zeising Reviewed by: emaste, kib, zeising Tested by: zeising Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D15170
Notes
Notes: svn path=/head/; revision=332895
Diffstat (limited to 'sbin/etherswitchcfg/ifmedia.c')
-rw-r--r--sbin/etherswitchcfg/ifmedia.c27
1 files changed, 0 insertions, 27 deletions
diff --git a/sbin/etherswitchcfg/ifmedia.c b/sbin/etherswitchcfg/ifmedia.c
index 4bd6582f185f..03ed4e56ab79 100644
--- a/sbin/etherswitchcfg/ifmedia.c
+++ b/sbin/etherswitchcfg/ifmedia.c
@@ -363,15 +363,6 @@ static struct ifmedia_description ifm_subtype_ethernet_aliases[] =
static struct ifmedia_description ifm_subtype_ethernet_option_descriptions[] =
IFM_SUBTYPE_ETHERNET_OPTION_DESCRIPTIONS;
-static struct ifmedia_description ifm_subtype_tokenring_descriptions[] =
- IFM_SUBTYPE_TOKENRING_DESCRIPTIONS;
-
-static struct ifmedia_description ifm_subtype_tokenring_aliases[] =
- IFM_SUBTYPE_TOKENRING_ALIASES;
-
-static struct ifmedia_description ifm_subtype_tokenring_option_descriptions[] =
- IFM_SUBTYPE_TOKENRING_OPTION_DESCRIPTIONS;
-
static struct ifmedia_description ifm_subtype_ieee80211_descriptions[] =
IFM_SUBTYPE_IEEE80211_DESCRIPTIONS;
@@ -447,24 +438,6 @@ static struct ifmedia_type_to_subtype ifmedia_types_to_subtypes[] = {
{
{ &ifm_subtype_shared_descriptions[0], 0 },
{ &ifm_subtype_shared_aliases[0], 1 },
- { &ifm_subtype_tokenring_descriptions[0], 0 },
- { &ifm_subtype_tokenring_aliases[0], 1 },
- { NULL, 0 },
- },
- {
- { &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_ieee80211_descriptions[0], 0 },
{ &ifm_subtype_ieee80211_aliases[0], 1 },
{ NULL, 0 },