diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2018-04-23 21:10:33 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2018-04-23 21:10:33 +0000 |
| commit | 4204224162bed8605ea05f2797af69d5c636e9bb (patch) | |
| tree | bf43ade279233a46210cbc135c14d3f7d09088b3 /lib/libifconfig | |
| parent | 7b7796eea50fb8beb0ea5dd53c0aa07103498442 (diff) | |
| download | src-test-4204224162bed8605ea05f2797af69d5c636e9bb.tar.gz src-test-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 'lib/libifconfig')
| -rw-r--r-- | lib/libifconfig/libifconfig_media.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/lib/libifconfig/libifconfig_media.c b/lib/libifconfig/libifconfig_media.c index 20b8af798bdfb..f7302d8a9b248 100644 --- a/lib/libifconfig/libifconfig_media.c +++ b/lib/libifconfig/libifconfig_media.c @@ -77,15 +77,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; @@ -165,24 +156,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 }, |