Deleted Added
full compact
if_media.h (170311) if_media.h (170530)
1/* $NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $ */
1/* $NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $ */
2/* $FreeBSD: head/sys/net/if_media.h 170311 2007-06-05 00:32:01Z davidch $ */
2/* $FreeBSD: head/sys/net/if_media.h 170530 2007-06-11 03:36:55Z sam $ */
3
4/*-
5 * Copyright (c) 1997
6 * Jonathan Stone and Jason R. Thorpe. All rights reserved.
7 *
8 * This software is derived from information provided by Matt Thomas.
9 *
10 * Redistribution and use in source and binary forms, with or without

--- 186 unchanged lines hidden (view full) ---

197#define IFM_IEEE80211_OFDM48 16 /* OFDM 48Mbps */
198#define IFM_IEEE80211_OFDM54 17 /* OFDM 54Mbps */
199#define IFM_IEEE80211_OFDM72 18 /* OFDM 72Mbps */
200#define IFM_IEEE80211_DS354k 19 /* Direct Sequence 354Kbps */
201#define IFM_IEEE80211_DS512k 20 /* Direct Sequence 512Kbps */
202#define IFM_IEEE80211_OFDM3 21 /* OFDM 3Mbps */
203#define IFM_IEEE80211_OFDM4 22 /* OFDM 4.5Mbps */
204#define IFM_IEEE80211_OFDM27 23 /* OFDM 27Mbps */
3
4/*-
5 * Copyright (c) 1997
6 * Jonathan Stone and Jason R. Thorpe. All rights reserved.
7 *
8 * This software is derived from information provided by Matt Thomas.
9 *
10 * Redistribution and use in source and binary forms, with or without

--- 186 unchanged lines hidden (view full) ---

197#define IFM_IEEE80211_OFDM48 16 /* OFDM 48Mbps */
198#define IFM_IEEE80211_OFDM54 17 /* OFDM 54Mbps */
199#define IFM_IEEE80211_OFDM72 18 /* OFDM 72Mbps */
200#define IFM_IEEE80211_DS354k 19 /* Direct Sequence 354Kbps */
201#define IFM_IEEE80211_DS512k 20 /* Direct Sequence 512Kbps */
202#define IFM_IEEE80211_OFDM3 21 /* OFDM 3Mbps */
203#define IFM_IEEE80211_OFDM4 22 /* OFDM 4.5Mbps */
204#define IFM_IEEE80211_OFDM27 23 /* OFDM 27Mbps */
205/* NB: not enough bits to express MCS fully */
206#define IFM_IEEE80211_MCS 24 /* HT MCS rate */
205
206#define IFM_IEEE80211_ADHOC 0x00000100 /* Operate in Adhoc mode */
207#define IFM_IEEE80211_HOSTAP 0x00000200 /* Operate in Host AP mode */
208#define IFM_IEEE80211_IBSS 0x00000400 /* Operate in IBSS mode */
209#define IFM_IEEE80211_IBSSMASTER 0x00000800 /* Operate as an IBSS master */
210#define IFM_IEEE80211_TURBO 0x00001000 /* Operate in turbo mode */
211#define IFM_IEEE80211_MONITOR 0x00002000 /* Operate in monitor mode */
207
208#define IFM_IEEE80211_ADHOC 0x00000100 /* Operate in Adhoc mode */
209#define IFM_IEEE80211_HOSTAP 0x00000200 /* Operate in Host AP mode */
210#define IFM_IEEE80211_IBSS 0x00000400 /* Operate in IBSS mode */
211#define IFM_IEEE80211_IBSSMASTER 0x00000800 /* Operate as an IBSS master */
212#define IFM_IEEE80211_TURBO 0x00001000 /* Operate in turbo mode */
213#define IFM_IEEE80211_MONITOR 0x00002000 /* Operate in monitor mode */
214#define IFM_IEEE80211_HT40PLUS 0x00004000 /* Operate in 11n HT40+ mode */
215#define IFM_IEEE80211_HT40MINUS 0x00008000 /* Operate in 11n HT40- mode */
212
213/* operating mode for multi-mode devices */
214#define IFM_IEEE80211_11A 0x00010000 /* 5Ghz, OFDM mode */
215#define IFM_IEEE80211_11B 0x00020000 /* Direct Sequence mode */
216#define IFM_IEEE80211_11G 0x00030000 /* 2Ghz, CCK mode */
217#define IFM_IEEE80211_FH 0x00040000 /* 2Ghz, GFSK mode */
216
217/* operating mode for multi-mode devices */
218#define IFM_IEEE80211_11A 0x00010000 /* 5Ghz, OFDM mode */
219#define IFM_IEEE80211_11B 0x00020000 /* Direct Sequence mode */
220#define IFM_IEEE80211_11G 0x00030000 /* 2Ghz, CCK mode */
221#define IFM_IEEE80211_FH 0x00040000 /* 2Ghz, GFSK mode */
222#define IFM_IEEE80211_11NA 0x00050000 /* 5Ghz, HT mode */
223#define IFM_IEEE80211_11NG 0x00060000 /* 2Ghz, HT mode */
218
219/*
220 * ATM
221 */
222#define IFM_ATM 0x000000a0
223#define IFM_ATM_UNKNOWN 3
224#define IFM_ATM_UTP_25 4
225#define IFM_ATM_TAXI_100 5

--- 263 unchanged lines hidden (view full) ---

489
490#define IFM_SUBTYPE_IEEE80211_OPTION_DESCRIPTIONS { \
491 { IFM_IEEE80211_ADHOC, "adhoc" }, \
492 { IFM_IEEE80211_HOSTAP, "hostap" }, \
493 { IFM_IEEE80211_IBSS, "ibss" }, \
494 { IFM_IEEE80211_IBSSMASTER, "ibss-master" }, \
495 { IFM_IEEE80211_TURBO, "turbo" }, \
496 { IFM_IEEE80211_MONITOR, "monitor" }, \
224
225/*
226 * ATM
227 */
228#define IFM_ATM 0x000000a0
229#define IFM_ATM_UNKNOWN 3
230#define IFM_ATM_UTP_25 4
231#define IFM_ATM_TAXI_100 5

--- 263 unchanged lines hidden (view full) ---

495
496#define IFM_SUBTYPE_IEEE80211_OPTION_DESCRIPTIONS { \
497 { IFM_IEEE80211_ADHOC, "adhoc" }, \
498 { IFM_IEEE80211_HOSTAP, "hostap" }, \
499 { IFM_IEEE80211_IBSS, "ibss" }, \
500 { IFM_IEEE80211_IBSSMASTER, "ibss-master" }, \
501 { IFM_IEEE80211_TURBO, "turbo" }, \
502 { IFM_IEEE80211_MONITOR, "monitor" }, \
503 { IFM_IEEE80211_HT40MINUS, "ht-" }, \
504 { IFM_IEEE80211_HT40PLUS, "ht+" }, \
497 { 0, NULL }, \
498}
499
500#define IFM_SUBTYPE_IEEE80211_MODE_DESCRIPTIONS { \
501 { IFM_AUTO, "autoselect" }, \
502 { IFM_IEEE80211_11A, "11a" }, \
503 { IFM_IEEE80211_11B, "11b" }, \
504 { IFM_IEEE80211_11G, "11g" }, \
505 { IFM_IEEE80211_FH, "fh" }, \
505 { 0, NULL }, \
506}
507
508#define IFM_SUBTYPE_IEEE80211_MODE_DESCRIPTIONS { \
509 { IFM_AUTO, "autoselect" }, \
510 { IFM_IEEE80211_11A, "11a" }, \
511 { IFM_IEEE80211_11B, "11b" }, \
512 { IFM_IEEE80211_11G, "11g" }, \
513 { IFM_IEEE80211_FH, "fh" }, \
514 { IFM_IEEE80211_11NA, "11na" }, \
515 { IFM_IEEE80211_11NG, "11ng" }, \
506 { 0, NULL }, \
507}
508
509#define IFM_SUBTYPE_IEEE80211_MODE_ALIASES { \
510 { IFM_AUTO, "auto" }, \
511 { 0, NULL }, \
512}
513

--- 146 unchanged lines hidden ---
516 { 0, NULL }, \
517}
518
519#define IFM_SUBTYPE_IEEE80211_MODE_ALIASES { \
520 { IFM_AUTO, "auto" }, \
521 { 0, NULL }, \
522}
523

--- 146 unchanged lines hidden ---