Deleted Added
full compact
if_media.h (172223) if_media.h (177616)
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 172223 2007-09-18 20:30:40Z sam $ */
2/* $FreeBSD: head/sys/net/if_media.h 177616 2008-03-25 21:22:43Z 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

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

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 */
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 */
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

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

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 */
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 */
211#define IFM_IEEE80211_WDS 0x00000800 /* Operate in WDS mode */
212#define IFM_IEEE80211_TURBO 0x00001000 /* Operate in turbo mode */
213#define IFM_IEEE80211_MONITOR 0x00002000 /* Operate in monitor mode */
214
215/* operating mode for multi-mode devices */
216#define IFM_IEEE80211_11A 0x00010000 /* 5Ghz, OFDM mode */
217#define IFM_IEEE80211_11B 0x00020000 /* Direct Sequence mode */
218#define IFM_IEEE80211_11G 0x00030000 /* 2Ghz, CCK mode */
219#define IFM_IEEE80211_FH 0x00040000 /* 2Ghz, GFSK mode */

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

490 { IFM_IEEE80211_OFDM27, "OFDM27" }, \
491 { 0, NULL }, \
492}
493
494#define IFM_SUBTYPE_IEEE80211_OPTION_DESCRIPTIONS { \
495 { IFM_IEEE80211_ADHOC, "adhoc" }, \
496 { IFM_IEEE80211_HOSTAP, "hostap" }, \
497 { IFM_IEEE80211_IBSS, "ibss" }, \
212#define IFM_IEEE80211_TURBO 0x00001000 /* Operate in turbo mode */
213#define IFM_IEEE80211_MONITOR 0x00002000 /* Operate in monitor mode */
214
215/* operating mode for multi-mode devices */
216#define IFM_IEEE80211_11A 0x00010000 /* 5Ghz, OFDM mode */
217#define IFM_IEEE80211_11B 0x00020000 /* Direct Sequence mode */
218#define IFM_IEEE80211_11G 0x00030000 /* 2Ghz, CCK mode */
219#define IFM_IEEE80211_FH 0x00040000 /* 2Ghz, GFSK mode */

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

490 { IFM_IEEE80211_OFDM27, "OFDM27" }, \
491 { 0, NULL }, \
492}
493
494#define IFM_SUBTYPE_IEEE80211_OPTION_DESCRIPTIONS { \
495 { IFM_IEEE80211_ADHOC, "adhoc" }, \
496 { IFM_IEEE80211_HOSTAP, "hostap" }, \
497 { IFM_IEEE80211_IBSS, "ibss" }, \
498 { IFM_IEEE80211_IBSSMASTER, "ibss-master" }, \
498 { IFM_IEEE80211_WDS, "wds" }, \
499 { IFM_IEEE80211_TURBO, "turbo" }, \
500 { IFM_IEEE80211_MONITOR, "monitor" }, \
501 { 0, NULL }, \
502}
503
504#define IFM_SUBTYPE_IEEE80211_MODE_DESCRIPTIONS { \
505 { IFM_AUTO, "autoselect" }, \
506 { IFM_IEEE80211_11A, "11a" }, \

--- 159 unchanged lines hidden ---
499 { IFM_IEEE80211_TURBO, "turbo" }, \
500 { IFM_IEEE80211_MONITOR, "monitor" }, \
501 { 0, NULL }, \
502}
503
504#define IFM_SUBTYPE_IEEE80211_MODE_DESCRIPTIONS { \
505 { IFM_AUTO, "autoselect" }, \
506 { IFM_IEEE80211_11A, "11a" }, \

--- 159 unchanged lines hidden ---