diff --git a/lib/libifconfig/libifconfig_media.c b/lib/libifconfig/libifconfig_media.c index ea0777f9cd74..20b8af798bdf 100644 --- a/lib/libifconfig/libifconfig_media.c +++ b/lib/libifconfig/libifconfig_media.c @@ -373,15 +373,6 @@ ifconfig_media_get_status(const struct ifmediareq *ifmr) } break; - case IFM_FDDI: - case IFM_TOKEN: - if (ifmr->ifm_status & IFM_ACTIVE) { - return ("inserted"); - } else { - return ("no ring"); - } - break; - case IFM_IEEE80211: if (ifmr->ifm_status & IFM_ACTIVE) { /* NB: only sta mode associates */ diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index 51653e2f8596..2709dd8c6696 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -333,8 +333,6 @@ media::media(config &, const char *var, const char *type) { static struct ifmedia_description media_types[] = { { IFM_ETHER, "Ethernet" }, - { IFM_TOKEN, "Tokenring" }, - { IFM_FDDI, "FDDI" }, { IFM_IEEE80211, "802.11" }, { IFM_ATM, "ATM" }, { -1, "unknown" }, diff --git a/sbin/etherswitchcfg/ifmedia.c b/sbin/etherswitchcfg/ifmedia.c index 0857629ac0fa..4bd6582f185f 100644 --- a/sbin/etherswitchcfg/ifmedia.c +++ b/sbin/etherswitchcfg/ifmedia.c @@ -159,14 +159,6 @@ media_status(int s) printf("no carrier"); break; - case IFM_FDDI: - case IFM_TOKEN: - if (ifmr.ifm_status & IFM_ACTIVE) - printf("inserted"); - else - printf("no ring"); - break; - case IFM_IEEE80211: if (ifmr.ifm_status & IFM_ACTIVE) { /* NB: only sta mode associates */ diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c index 0012cbd0fa2c..7eae494fa316 100644 --- a/sbin/ifconfig/ifmedia.c +++ b/sbin/ifconfig/ifmedia.c @@ -168,14 +168,6 @@ media_status(int s) printf("no carrier"); break; - case IFM_FDDI: - case IFM_TOKEN: - if (ifmr.ifm_status & IFM_ACTIVE) - printf("inserted"); - else - printf("no ring"); - break; - case IFM_IEEE80211: if (ifmr.ifm_status & IFM_ACTIVE) { /* NB: only sta mode associates */