Remove support for FDDI and token ring media types in userland utilities.

Reviewed by:	kib
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D15077
This commit is contained in:
Brooks Davis 2018-04-16 18:07:51 +00:00
parent b6cb3eab1e
commit eec02418d8
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=332630
4 changed files with 0 additions and 27 deletions

View File

@ -373,15 +373,6 @@ ifconfig_media_get_status(const struct ifmediareq *ifmr)
} }
break; break;
case IFM_FDDI:
case IFM_TOKEN:
if (ifmr->ifm_status & IFM_ACTIVE) {
return ("inserted");
} else {
return ("no ring");
}
break;
case IFM_IEEE80211: case IFM_IEEE80211:
if (ifmr->ifm_status & IFM_ACTIVE) { if (ifmr->ifm_status & IFM_ACTIVE) {
/* NB: only sta mode associates */ /* NB: only sta mode associates */

View File

@ -333,8 +333,6 @@ media::media(config &, const char *var, const char *type)
{ {
static struct ifmedia_description media_types[] = { static struct ifmedia_description media_types[] = {
{ IFM_ETHER, "Ethernet" }, { IFM_ETHER, "Ethernet" },
{ IFM_TOKEN, "Tokenring" },
{ IFM_FDDI, "FDDI" },
{ IFM_IEEE80211, "802.11" }, { IFM_IEEE80211, "802.11" },
{ IFM_ATM, "ATM" }, { IFM_ATM, "ATM" },
{ -1, "unknown" }, { -1, "unknown" },

View File

@ -159,14 +159,6 @@ media_status(int s)
printf("no carrier"); printf("no carrier");
break; break;
case IFM_FDDI:
case IFM_TOKEN:
if (ifmr.ifm_status & IFM_ACTIVE)
printf("inserted");
else
printf("no ring");
break;
case IFM_IEEE80211: case IFM_IEEE80211:
if (ifmr.ifm_status & IFM_ACTIVE) { if (ifmr.ifm_status & IFM_ACTIVE) {
/* NB: only sta mode associates */ /* NB: only sta mode associates */

View File

@ -168,14 +168,6 @@ media_status(int s)
printf("no carrier"); printf("no carrier");
break; break;
case IFM_FDDI:
case IFM_TOKEN:
if (ifmr.ifm_status & IFM_ACTIVE)
printf("inserted");
else
printf("no ring");
break;
case IFM_IEEE80211: case IFM_IEEE80211:
if (ifmr.ifm_status & IFM_ACTIVE) { if (ifmr.ifm_status & IFM_ACTIVE) {
/* NB: only sta mode associates */ /* NB: only sta mode associates */