2c2
< /* $FreeBSD: head/sys/net/if_media.h 215297 2010-11-14 13:26:10Z marius $ */
---
> /* $FreeBSD: head/sys/net/if_media.h 217010 2011-01-05 14:51:04Z marius $ */
39c39
< #define _NET_IF_MEDIA_H_
---
> #define _NET_IF_MEDIA_H_
147,152c147,152
< #define IFM_2500_SX 21 /* 2500BaseSX - multi-mode fiber */
< #define IFM_10G_TWINAX 22 /* 10GBase Twinax copper */
< #define IFM_10G_TWINAX_LONG 23 /* 10GBase Twinax Long copper */
< #define IFM_10G_LRM 24 /* 10GBase-LRM 850nm Multi-mode */
< #define IFM_UNKNOWN 25 /* media types not defined yet */
< #define IFM_10G_T 26 /* 10GBase-T - RJ45 */
---
> #define IFM_2500_SX 21 /* 2500BaseSX - multi-mode fiber */
> #define IFM_10G_TWINAX 22 /* 10GBase Twinax copper */
> #define IFM_10G_TWINAX_LONG 23 /* 10GBase Twinax Long copper */
> #define IFM_10G_LRM 24 /* 10GBase-LRM 850nm Multi-mode */
> #define IFM_UNKNOWN 25 /* media types not defined yet */
> #define IFM_10G_T 26 /* 10GBase-T - RJ45 */
154d153
<
235,244c234,243
< #define IFM_ATM 0x000000a0
< #define IFM_ATM_UNKNOWN 3
< #define IFM_ATM_UTP_25 4
< #define IFM_ATM_TAXI_100 5
< #define IFM_ATM_TAXI_140 6
< #define IFM_ATM_MM_155 7
< #define IFM_ATM_SM_155 8
< #define IFM_ATM_UTP_155 9
< #define IFM_ATM_MM_622 10
< #define IFM_ATM_SM_622 11
---
> #define IFM_ATM 0x000000a0
> #define IFM_ATM_UNKNOWN 3
> #define IFM_ATM_UTP_25 4
> #define IFM_ATM_TAXI_100 5
> #define IFM_ATM_TAXI_140 6
> #define IFM_ATM_MM_155 7
> #define IFM_ATM_SM_155 8
> #define IFM_ATM_UTP_155 9
> #define IFM_ATM_MM_622 10
> #define IFM_ATM_SM_622 11
246,248c245,247
< #define IFM_ATM_SDH 0x00000100 /* SDH instead of SONET */
< #define IFM_ATM_NOSCRAMB 0x00000200 /* no scrambling */
< #define IFM_ATM_UNASSIGNED 0x00000400 /* unassigned cells */
---
> #define IFM_ATM_SDH 0x00000100 /* SDH instead of SONET */
> #define IFM_ATM_NOSCRAMB 0x00000200 /* no scrambling */
> #define IFM_ATM_UNASSIGNED 0x00000400 /* unassigned cells */
298,300c297,299
< #define IFM_STATUS_VALID_LIST { \
< IFM_AVALID, \
< 0 \
---
> #define IFM_STATUS_VALID_LIST { \
> IFM_AVALID, \
> 0 \
306,311c305,310
< #define IFM_TYPE(x) ((x) & IFM_NMASK)
< #define IFM_SUBTYPE(x) ((x) & IFM_TMASK)
< #define IFM_TYPE_OPTIONS(x) ((x) & IFM_OMASK)
< #define IFM_INST(x) (((x) & IFM_IMASK) >> IFM_ISHIFT)
< #define IFM_OPTIONS(x) ((x) & (IFM_OMASK|IFM_GMASK))
< #define IFM_MODE(x) ((x) & IFM_MMASK)
---
> #define IFM_TYPE(x) ((x) & IFM_NMASK)
> #define IFM_SUBTYPE(x) ((x) & IFM_TMASK)
> #define IFM_TYPE_OPTIONS(x) ((x) & IFM_OMASK)
> #define IFM_INST(x) (((x) & IFM_IMASK) >> IFM_ISHIFT)
> #define IFM_OPTIONS(x) ((x) & (IFM_OMASK | IFM_GMASK))
> #define IFM_MODE(x) ((x) & IFM_MMASK)
313c312
< #define IFM_INST_MAX IFM_INST(IFM_IMASK)
---
> #define IFM_INST_MAX IFM_INST(IFM_IMASK)
544c543
< # define IFM_SUBTYPE_ATM_DESCRIPTIONS { \
---
> #define IFM_SUBTYPE_ATM_DESCRIPTIONS { \
558c557
< # define IFM_SUBTYPE_ATM_ALIASES { \
---
> #define IFM_SUBTYPE_ATM_ALIASES { \
579d577
<
611c609
< #define IFM_BAUDRATE_DESCRIPTIONS { \
---
> #define IFM_BAUDRATE_DESCRIPTIONS { \
675c673
< #define IFM_STATUS_DESC(ifms, bit) \
---
> #define IFM_STATUS_DESC(ifms, bit) \
678c676
< #define IFM_STATUS_DESCRIPTIONS { \
---
> #define IFM_STATUS_DESCRIPTIONS { \