2c2
< /* $FreeBSD: head/sys/net/if_media.h 95673 2002-04-28 20:34:20Z phk $ */
---
> /* $FreeBSD: head/sys/net/if_media.h 95702 2002-04-29 05:32:44Z phk $ */
124c124
< #define IFM_ETHER 0x00000020
---
> #define IFM_ETHER 0x00000020
133,140c133,139
< #define IFM_1000_FX 11 /* 1000BaseFX - gigabit over fiber */
< #define IFM_10_STP 12 /* 10BaseT over shielded TP */
< #define IFM_10_FL 13 /* 10baseFL - Fiber */
< #define IFM_1000_SX 14 /* 1000BaseSX Multi-mode Fiber */
< #define IFM_1000_LX 15 /* 1000BaseLX Single-mode Fiber */
< #define IFM_1000_CX 16 /* 1000BaseCX 150ohm STP */
< #define IFM_1000_T 17 /* 1000BaseTX 4 pair cat 5 */
< #define IFM_homePNA 18 /* HomePNA media for ethernet frames */
---
> #define IFM_1000_SX 11 /* 1000BaseSX - multi-mode fiber */
> #define IFM_10_STP 12 /* 10BaseT over shielded TP */
> #define IFM_10_FL 13 /* 10BaseFL - Fiber */
> #define IFM_1000_LX 14 /* 1000baseLX - single-mode fiber */
> #define IFM_1000_CX 15 /* 1000baseCX - 150ohm STP */
> #define IFM_1000_T 16 /* 1000baseT - 4 pair cat 5 */
> #define IFM_HPNA_1 17 /* HomePNA 1.0 (1Mb/s) */
142a142,143
> #define IFM_ETH_MASTER 0x00000100 /* master mode (1000baseT) */
>
151,152c152,153
< #define IFM_TOK_STP100 7 /* Shielded twisted pair 100m - DB9 */
< #define IFM_TOK_UTP100 8 /* Unshielded twisted pair 100m - RJ45 */
---
> #define IFM_TOK_STP100 7 /* Shielded twisted pair 100m - DB9 */
> #define IFM_TOK_UTP100 8 /* Unshielded twisted pair 100m - RJ45 */
156,158c157,159
< #define IFM_TOK_DTR 0x00002000 /* Dedicated token ring */
< #define IFM_TOK_CLASSIC 0x00004000 /* Classic token ring */
< #define IFM_TOK_AUTO 0x00008000 /* Automatic Dedicate/Classic token ring */
---
> #define IFM_TOK_DTR 0x00002000 /* Dedicated token ring */
> #define IFM_TOK_CLASSIC 0x00004000 /* Classic token ring */
> #define IFM_TOK_AUTO 0x00008000 /* Automatic Dedicate/Classic token ring */
166,167c167,168
< #define IFM_FDDI_UTP 5 /* CDDI / UTP */
< #define IFM_FDDI_DA 0x00000100 /* Dual attach / single attach */
---
> #define IFM_FDDI_UTP 5 /* CDDI / UTP */
> #define IFM_FDDI_DA 0x00000100 /* Dual attach / single attach */
172,181c173,182
< #define IFM_IEEE80211 0x00000080
< #define IFM_IEEE80211_FH1 3 /* Frequency Hopping 1Mbps */
< #define IFM_IEEE80211_FH2 4 /* Frequency Hopping 2Mbps */
< #define IFM_IEEE80211_DS1 5 /* Direct Sequence 1Mbps */
< #define IFM_IEEE80211_DS2 6 /* Direct Sequence 2Mbps */
< #define IFM_IEEE80211_DS5 7 /* Direct Sequence 5.5Mbps */
< #define IFM_IEEE80211_DS11 8 /* Direct Sequence 11Mbps */
< #define IFM_IEEE80211_DS22 9 /* Direct Sequence 22Mbps */
< #define IFM_IEEE80211_ADHOC 0x00000100 /* Operate in Adhoc mode */
< #define IFM_IEEE80211_HOSTAP 0x00000200 /* Operate in Host AP mode */
---
> #define IFM_IEEE80211 0x00000080
> #define IFM_IEEE80211_FH1 3 /* Frequency Hopping 1Mbps */
> #define IFM_IEEE80211_FH2 4 /* Frequency Hopping 2Mbps */
> #define IFM_IEEE80211_DS1 5 /* Direct Sequence 1Mbps */
> #define IFM_IEEE80211_DS2 6 /* Direct Sequence 2Mbps */
> #define IFM_IEEE80211_DS5 7 /* Direct Sequence 5.5Mbps */
> #define IFM_IEEE80211_DS11 8 /* Direct Sequence 11Mbps */
> #define IFM_IEEE80211_DS22 9 /* Direct Sequence 22Mbps */
> #define IFM_IEEE80211_ADHOC 0x00000100 /* Operate in Adhoc mode */
> #define IFM_IEEE80211_HOSTAP 0x00000200 /* Operate in Host AP mode */
193c194
< #define IFM_FDX 0x00100000 /* Force full duplex */
---
> #define IFM_FDX 0x00100000 /* Force full duplex */
195,197c196,198
< #define IFM_FLAG0 0x01000000 /* Driver defined flag */
< #define IFM_FLAG1 0x02000000 /* Driver defined flag */
< #define IFM_FLAG2 0x04000000 /* Driver defined flag */
---
> #define IFM_FLAG0 0x01000000 /* Driver defined flag */
> #define IFM_FLAG1 0x02000000 /* Driver defined flag */
> #define IFM_FLAG2 0x04000000 /* Driver defined flag */
221c222
< #define IFM_TYPE_OPTIONS(x) ((x) & IFM_OMASK)
---
> #define IFM_TYPE_OPTIONS(x) ((x) & IFM_OMASK)
223c224
< #define IFM_OPTIONS(x) ((x) & (IFM_OMASK|IFM_GMASK))
---
> #define IFM_OPTIONS(x) ((x) & (IFM_OMASK|IFM_GMASK))
225c226
< #define IFM_INST_MAX IFM_INST(IFM_IMASK)
---
> #define IFM_INST_MAX IFM_INST(IFM_IMASK)
230c231
< #define IFM_MAKEWORD(type, subtype, options, instance) \
---
> #define IFM_MAKEWORD(type, subtype, options, instance) \
262d262
< { IFM_1000_FX, "1000baseFX" }, \
269c269,270
< { IFM_homePNA, "homePNA" }, \
---
> { IFM_1000_T, "1000baseT" }, \
> { IFM_HPNA_1, "homePNA" }, \
281d281
< { IFM_100_FX, "100FX" }, \
285d284
< { IFM_1000_FX, "1000FX" }, \
288,291c287,291
< { IFM_1000_FX, "1000SX" }, \
< { IFM_1000_FX, "1000LX" }, \
< { IFM_1000_FX, "1000CX" }, \
< { IFM_1000_FX, "1000TX" }, \
---
> { IFM_1000_SX, "1000SX" }, \
> { IFM_1000_LX, "1000LX" }, \
> { IFM_1000_CX, "1000CX" }, \
> { IFM_1000_T, "1000TX" }, \
> { IFM_1000_T, "1000T" }, \