diff options
| author |   henning <henning@openbsd.org> | 2007-05-29 22:11:57 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2007-05-29 22:11:57 +0000 |
| commit | e09fcb2f1daf9b2085ae14dcadc58928ae8a78cb (patch) | |
| tree | 8c06280df9fd82225dab78671a02c4901abb5831 /sys/net/if_media.h | |
| parent | Demote support for ospfd. It is possible to specify a demote group on (diff) | |
| download | wireguard-openbsd-e09fcb2f1daf9b2085ae14dcadc58928ae8a78cb.tar.xz wireguard-openbsd-e09fcb2f1daf9b2085ae14dcadc58928ae8a78cb.zip | |
remove token ring leftovers, ok mcbride pval
Diffstat (limited to 'sys/net/if_media.h')
| -rw-r--r-- | sys/net/if_media.h | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/sys/net/if_media.h b/sys/net/if_media.h index 883c61c183a..16707aaaae4 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_media.h,v 1.23 2006/12/29 20:06:31 kettenis Exp $ */ +/* $OpenBSD: if_media.h,v 1.24 2007/05/29 22:11:57 henning Exp $ */ /* $NetBSD: if_media.h,v 1.22 2000/02/17 21:53:16 sommerfeld Exp $ */ /*- @@ -189,18 +189,6 @@ int ifmedia_baudrate(int); #define IFM_ETH_TXPAUSE 0x00000400 /* transmit PAUSE frames */ /* - * Token ring - */ -#define IFM_TOKEN 0x00000040 -#define IFM_TOK_STP4 3 /* Shielded twisted pair 4m - DB9 */ -#define IFM_TOK_STP16 4 /* Shielded twisted pair 16m - DB9 */ -#define IFM_TOK_UTP4 5 /* Unshielded twisted pair 4m - RJ45 */ -#define IFM_TOK_UTP16 6 /* Unshielded twisted pair 16m - RJ45 */ -#define IFM_TOK_ETR 0x00000200 /* Early token release */ -#define IFM_TOK_SRCRT 0x00000400 /* Enable source routing features */ -#define IFM_TOK_ALLR 0x00000800 /* All routes / Single route bcast */ - -/* * FDDI */ #define IFM_FDDI 0x00000060 @@ -369,8 +357,6 @@ struct ifmedia_description { #define IFM_TYPE_DESCRIPTIONS { \ { IFM_ETHER, "Ethernet" }, \ { IFM_ETHER, "ether" }, \ - { IFM_TOKEN, "TokenRing" }, \ - { IFM_TOKEN, "token" }, \ { IFM_FDDI, "FDDI" }, \ { IFM_IEEE80211, "IEEE802.11" }, \ { IFM_TDM, "TDM" }, \ @@ -437,15 +423,6 @@ struct ifmedia_description { { IFM_ETHER|IFM_10G_CX4, "10GCX4" }, \ { IFM_ETHER|IFM_10G_CX4, "10GBASE-CX4" }, \ \ - { IFM_TOKEN|IFM_TOK_STP4, "DB9/4Mbit" }, \ - { IFM_TOKEN|IFM_TOK_STP4, "4STP" }, \ - { IFM_TOKEN|IFM_TOK_STP16, "DB9/16Mbit" }, \ - { IFM_TOKEN|IFM_TOK_STP16, "16STP" }, \ - { IFM_TOKEN|IFM_TOK_UTP4, "UTP/4Mbit" }, \ - { IFM_TOKEN|IFM_TOK_UTP4, "4UTP" }, \ - { IFM_TOKEN|IFM_TOK_UTP16, "UTP/16Mbit" }, \ - { IFM_TOKEN|IFM_TOK_UTP16, "16UTP" }, \ - \ { IFM_FDDI|IFM_FDDI_SMF, "Single-mode" }, \ { IFM_FDDI|IFM_FDDI_SMF, "SMF" }, \ { IFM_FDDI|IFM_FDDI_MMF, "Multi-mode" }, \ @@ -513,13 +490,6 @@ struct ifmedia_description { { IFM_ETHER|IFM_ETH_RXPAUSE, "rxpause" }, \ { IFM_ETHER|IFM_ETH_TXPAUSE, "txpause" }, \ \ - { IFM_TOKEN|IFM_TOK_ETR, "EarlyTokenRelease" }, \ - { IFM_TOKEN|IFM_TOK_ETR, "ETR" }, \ - { IFM_TOKEN|IFM_TOK_SRCRT, "SourceRouting" }, \ - { IFM_TOKEN|IFM_TOK_SRCRT, "SRCRT" }, \ - { IFM_TOKEN|IFM_TOK_ALLR, "AllRoutes" }, \ - { IFM_TOKEN|IFM_TOK_ALLR, "ALLR" }, \ - \ { IFM_FDDI|IFM_FDDI_DA, "dual-attach" }, \ { IFM_FDDI|IFM_FDDI_DA, "das" }, \ \ @@ -567,11 +537,6 @@ struct ifmedia_baudrate { { IFM_ETHER|IFM_10G_SR, IF_Mbps(1000) }, \ { IFM_ETHER|IFM_10G_CX4, IF_Mbps(1000) }, \ \ - { IFM_TOKEN|IFM_TOK_STP4, IF_Mbps(4) }, \ - { IFM_TOKEN|IFM_TOK_STP16, IF_Mbps(16) }, \ - { IFM_TOKEN|IFM_TOK_UTP4, IF_Mbps(4) }, \ - { IFM_TOKEN|IFM_TOK_UTP16, IF_Mbps(16) }, \ - \ { IFM_FDDI|IFM_FDDI_SMF, IF_Mbps(100) }, \ { IFM_FDDI|IFM_FDDI_MMF, IF_Mbps(100) }, \ { IFM_FDDI|IFM_FDDI_UTP, IF_Mbps(100) }, \ @@ -627,8 +592,6 @@ struct ifmedia_status_description { { "no carrier", "active" } }, \ { IFM_FDDI, IFM_AVALID, IFM_ACTIVE, \ { "no ring", "inserted" } }, \ - { IFM_TOKEN, IFM_AVALID, IFM_ACTIVE, \ - { "no ring", "inserted" } }, \ { IFM_IEEE80211, IFM_AVALID, IFM_ACTIVE, \ { "no network", "active" } }, \ { IFM_TDM, IFM_AVALID, IFM_ACTIVE, \ |