svn commit: r332630 - in head: lib/libifconfig sbin/devd sbin/etherswitchcfg sbin/ifconfig
Brooks Davis
brooks at FreeBSD.org
Mon Apr 16 18:07:52 UTC 2018
Author: brooks
Date: Mon Apr 16 18:07:51 2018
New Revision: 332630
URL: https://svnweb.freebsd.org/changeset/base/332630
Log:
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
Modified:
head/lib/libifconfig/libifconfig_media.c
head/sbin/devd/devd.cc
head/sbin/etherswitchcfg/ifmedia.c
head/sbin/ifconfig/ifmedia.c
Modified: head/lib/libifconfig/libifconfig_media.c
==============================================================================
--- head/lib/libifconfig/libifconfig_media.c Mon Apr 16 17:43:26 2018 (r332629)
+++ head/lib/libifconfig/libifconfig_media.c Mon Apr 16 18:07:51 2018 (r332630)
@@ -373,15 +373,6 @@ ifconfig_media_get_status(const struct ifmediareq *ifm
}
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 */
Modified: head/sbin/devd/devd.cc
==============================================================================
--- head/sbin/devd/devd.cc Mon Apr 16 17:43:26 2018 (r332629)
+++ head/sbin/devd/devd.cc Mon Apr 16 18:07:51 2018 (r332630)
@@ -333,8 +333,6 @@ media::media(config &, const char *var, const char *ty
{
static struct ifmedia_description media_types[] = {
{ IFM_ETHER, "Ethernet" },
- { IFM_TOKEN, "Tokenring" },
- { IFM_FDDI, "FDDI" },
{ IFM_IEEE80211, "802.11" },
{ IFM_ATM, "ATM" },
{ -1, "unknown" },
Modified: head/sbin/etherswitchcfg/ifmedia.c
==============================================================================
--- head/sbin/etherswitchcfg/ifmedia.c Mon Apr 16 17:43:26 2018 (r332629)
+++ head/sbin/etherswitchcfg/ifmedia.c Mon Apr 16 18:07:51 2018 (r332630)
@@ -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 */
Modified: head/sbin/ifconfig/ifmedia.c
==============================================================================
--- head/sbin/ifconfig/ifmedia.c Mon Apr 16 17:43:26 2018 (r332629)
+++ head/sbin/ifconfig/ifmedia.c Mon Apr 16 18:07:51 2018 (r332630)
@@ -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 */
More information about the svn-src-head
mailing list