Deleted Added
full compact
ieee80211_var.h (124543) ieee80211_var.h (127648)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

24 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
25 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 *
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

24 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
25 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 *
32 * $FreeBSD: head/sys/net80211/ieee80211_var.h 124543 2004-01-15 08:44:27Z onoe $
32 * $FreeBSD: head/sys/net80211/ieee80211_var.h 127648 2004-03-30 22:57:57Z sam $
33 */
34#ifndef _NET80211_IEEE80211_VAR_H_
35#define _NET80211_IEEE80211_VAR_H_
36
37/*
38 * Definitions for IEEE 802.11 drivers.
39 */
40
41#include <net80211/ieee80211.h>
42#include <net80211/ieee80211_crypto.h>
43#include <net80211/ieee80211_ioctl.h> /* for ieee80211_stats */
44#include <net80211/ieee80211_node.h>
45#include <net80211/ieee80211_proto.h>
46
47#define IEEE80211_CHAN_MAX 255
48#define IEEE80211_CHAN_ANY 0xffff /* token for ``any channel'' */
49#define IEEE80211_CHAN_ANYC \
50 ((struct ieee80211_channel *) IEEE80211_CHAN_ANY)
51
33 */
34#ifndef _NET80211_IEEE80211_VAR_H_
35#define _NET80211_IEEE80211_VAR_H_
36
37/*
38 * Definitions for IEEE 802.11 drivers.
39 */
40
41#include <net80211/ieee80211.h>
42#include <net80211/ieee80211_crypto.h>
43#include <net80211/ieee80211_ioctl.h> /* for ieee80211_stats */
44#include <net80211/ieee80211_node.h>
45#include <net80211/ieee80211_proto.h>
46
47#define IEEE80211_CHAN_MAX 255
48#define IEEE80211_CHAN_ANY 0xffff /* token for ``any channel'' */
49#define IEEE80211_CHAN_ANYC \
50 ((struct ieee80211_channel *) IEEE80211_CHAN_ANY)
51
52#define IEEE80211_TXPOWER_MAX 100 /* max power */
53#define IEEE80211_TXPOWER_MIN 0 /* kill radio (if possible) */
54
52enum ieee80211_phytype {
53 IEEE80211_T_DS, /* direct sequence spread spectrum */
54 IEEE80211_T_FH, /* frequency hopping */
55 IEEE80211_T_OFDM, /* frequency division multiplexing */
56 IEEE80211_T_TURBO, /* high rate OFDM, aka turbo mode */
57};
58#define IEEE80211_T_CCK IEEE80211_T_DS /* more common nomenclature */
59

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

72 IEEE80211_M_STA = 1, /* infrastructure station */
73 IEEE80211_M_IBSS = 0, /* IBSS (adhoc) station */
74 IEEE80211_M_AHDEMO = 3, /* Old lucent compatible adhoc demo */
75 IEEE80211_M_HOSTAP = 6, /* Software Access Point */
76 IEEE80211_M_MONITOR = 8 /* Monitor mode */
77};
78
79/*
55enum ieee80211_phytype {
56 IEEE80211_T_DS, /* direct sequence spread spectrum */
57 IEEE80211_T_FH, /* frequency hopping */
58 IEEE80211_T_OFDM, /* frequency division multiplexing */
59 IEEE80211_T_TURBO, /* high rate OFDM, aka turbo mode */
60};
61#define IEEE80211_T_CCK IEEE80211_T_DS /* more common nomenclature */
62

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

75 IEEE80211_M_STA = 1, /* infrastructure station */
76 IEEE80211_M_IBSS = 0, /* IBSS (adhoc) station */
77 IEEE80211_M_AHDEMO = 3, /* Old lucent compatible adhoc demo */
78 IEEE80211_M_HOSTAP = 6, /* Software Access Point */
79 IEEE80211_M_MONITOR = 8 /* Monitor mode */
80};
81
82/*
83 * 802.11g protection mode.
84 */
85enum ieee80211_protmode {
86 IEEE80211_PROT_NONE = 0, /* no protection */
87 IEEE80211_PROT_CTSONLY = 1, /* CTS to self */
88 IEEE80211_PROT_RTSCTS = 2, /* RTS-CTS */
89};
90
91/*
80 * Channels are specified by frequency and attributes.
81 */
82struct ieee80211_channel {
83 u_int16_t ic_freq; /* setting in Mhz */
84 u_int16_t ic_flags; /* see below */
85};
86
87/* bits 0-3 are for private use by drivers */

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

161 struct ifqueue ic_mgtq;
162 u_int32_t ic_flags; /* state flags */
163 u_int32_t ic_caps; /* capabilities */
164 u_int16_t ic_modecaps; /* set of mode capabilities */
165 u_int16_t ic_curmode; /* current mode */
166 enum ieee80211_phytype ic_phytype; /* XXX wrong for multi-mode */
167 enum ieee80211_opmode ic_opmode; /* operation mode */
168 enum ieee80211_state ic_state; /* 802.11 state */
92 * Channels are specified by frequency and attributes.
93 */
94struct ieee80211_channel {
95 u_int16_t ic_freq; /* setting in Mhz */
96 u_int16_t ic_flags; /* see below */
97};
98
99/* bits 0-3 are for private use by drivers */

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

173 struct ifqueue ic_mgtq;
174 u_int32_t ic_flags; /* state flags */
175 u_int32_t ic_caps; /* capabilities */
176 u_int16_t ic_modecaps; /* set of mode capabilities */
177 u_int16_t ic_curmode; /* current mode */
178 enum ieee80211_phytype ic_phytype; /* XXX wrong for multi-mode */
179 enum ieee80211_opmode ic_opmode; /* operation mode */
180 enum ieee80211_state ic_state; /* 802.11 state */
181 enum ieee80211_protmode ic_protmode; /* 802.11g protection mode */
169 struct ifmedia ic_media; /* interface media config */
170 struct bpf_if *ic_rawbpf; /* packet filter structure */
171 struct ieee80211_node *ic_bss; /* information for this node */
172 struct ieee80211_channel *ic_ibss_chan;
173 int ic_fixed_rate; /* index to ic_sup_rates[] */
174 u_int16_t ic_rtsthreshold;
175 u_int16_t ic_fragthreshold;
176 struct mtx ic_nodelock; /* on node table */

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

221#define IEEE80211_F_ROAMING 0x00002000 /* CONF: roaming enabled */
222#define IEEE80211_F_SWRETRY 0x00004000 /* CONF: sw tx retry enabled */
223#define IEEE80211_F_TXPMGT 0x00018000 /* STATUS: tx power */
224#define IEEE80211_F_TXPOW_OFF 0x00000000 /* TX Power: radio disabled */
225#define IEEE80211_F_TXPOW_FIXED 0x00008000 /* TX Power: fixed rate */
226#define IEEE80211_F_TXPOW_AUTO 0x00010000 /* TX Power: undefined */
227#define IEEE80211_F_SHSLOT 0x00020000 /* CONF: short slot time */
228#define IEEE80211_F_SHPREAMBLE 0x00040000 /* CONF: short preamble */
182 struct ifmedia ic_media; /* interface media config */
183 struct bpf_if *ic_rawbpf; /* packet filter structure */
184 struct ieee80211_node *ic_bss; /* information for this node */
185 struct ieee80211_channel *ic_ibss_chan;
186 int ic_fixed_rate; /* index to ic_sup_rates[] */
187 u_int16_t ic_rtsthreshold;
188 u_int16_t ic_fragthreshold;
189 struct mtx ic_nodelock; /* on node table */

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

234#define IEEE80211_F_ROAMING 0x00002000 /* CONF: roaming enabled */
235#define IEEE80211_F_SWRETRY 0x00004000 /* CONF: sw tx retry enabled */
236#define IEEE80211_F_TXPMGT 0x00018000 /* STATUS: tx power */
237#define IEEE80211_F_TXPOW_OFF 0x00000000 /* TX Power: radio disabled */
238#define IEEE80211_F_TXPOW_FIXED 0x00008000 /* TX Power: fixed rate */
239#define IEEE80211_F_TXPOW_AUTO 0x00010000 /* TX Power: undefined */
240#define IEEE80211_F_SHSLOT 0x00020000 /* CONF: short slot time */
241#define IEEE80211_F_SHPREAMBLE 0x00040000 /* CONF: short preamble */
242#define IEEE80211_F_USEPROT 0x00100000 /* STATUS: protection enabled */
243#define IEEE80211_F_USEBARKER 0x00200000 /* STATUS: use barker preamble*/
229
230/* ic_caps */
231#define IEEE80211_C_WEP 0x00000001 /* CAPABILITY: WEP available */
232#define IEEE80211_C_IBSS 0x00000002 /* CAPABILITY: IBSS available */
233#define IEEE80211_C_PMGT 0x00000004 /* CAPABILITY: Power mgmt */
234#define IEEE80211_C_HOSTAP 0x00000008 /* CAPABILITY: HOSTAP avail */
235#define IEEE80211_C_AHDEMO 0x00000010 /* CAPABILITY: Old Adhoc Demo */
236#define IEEE80211_C_SWRETRY 0x00000020 /* CAPABILITY: sw tx retry */

--- 43 unchanged lines hidden ---
244
245/* ic_caps */
246#define IEEE80211_C_WEP 0x00000001 /* CAPABILITY: WEP available */
247#define IEEE80211_C_IBSS 0x00000002 /* CAPABILITY: IBSS available */
248#define IEEE80211_C_PMGT 0x00000004 /* CAPABILITY: Power mgmt */
249#define IEEE80211_C_HOSTAP 0x00000008 /* CAPABILITY: HOSTAP avail */
250#define IEEE80211_C_AHDEMO 0x00000010 /* CAPABILITY: Old Adhoc Demo */
251#define IEEE80211_C_SWRETRY 0x00000020 /* CAPABILITY: sw tx retry */

--- 43 unchanged lines hidden ---