Deleted Added
full compact
ieee80211_var.h (202612) ieee80211_var.h (205513)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2009 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:

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

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2009 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:

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

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/net80211/ieee80211_var.h 202612 2010-01-19 05:00:57Z thompsa $
26 * $FreeBSD: head/sys/net80211/ieee80211_var.h 205513 2010-03-23 12:03:09Z rpaulo $
27 */
28#ifndef _NET80211_IEEE80211_VAR_H_
29#define _NET80211_IEEE80211_VAR_H_
30
31/*
32 * Definitions for IEEE 802.11 drivers.
33 */
34/* NB: portability glue must go first */

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

132 struct task ic_bmiss_task; /* deferred beacon miss hndlr */
133
134 uint32_t ic_flags; /* state flags */
135 uint32_t ic_flags_ext; /* extended state flags */
136 uint32_t ic_flags_ht; /* HT state flags */
137 uint32_t ic_flags_ven; /* vendor state flags */
138 uint32_t ic_caps; /* capabilities */
139 uint32_t ic_htcaps; /* HT capabilities */
27 */
28#ifndef _NET80211_IEEE80211_VAR_H_
29#define _NET80211_IEEE80211_VAR_H_
30
31/*
32 * Definitions for IEEE 802.11 drivers.
33 */
34/* NB: portability glue must go first */

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

132 struct task ic_bmiss_task; /* deferred beacon miss hndlr */
133
134 uint32_t ic_flags; /* state flags */
135 uint32_t ic_flags_ext; /* extended state flags */
136 uint32_t ic_flags_ht; /* HT state flags */
137 uint32_t ic_flags_ven; /* vendor state flags */
138 uint32_t ic_caps; /* capabilities */
139 uint32_t ic_htcaps; /* HT capabilities */
140 uint32_t ic_htextcaps; /* HT extended capabilities */
140 uint32_t ic_cryptocaps; /* crypto capabilities */
141 uint8_t ic_modecaps[2]; /* set of mode capabilities */
142 uint8_t ic_promisc; /* vap's needing promisc mode */
143 uint8_t ic_allmulti; /* vap's needing all multicast*/
144 uint8_t ic_nrunning; /* vap's marked running */
145 uint8_t ic_curmode; /* current mode */
146 uint16_t ic_bintval; /* beacon interval */
147 uint16_t ic_lintval; /* listen interval */

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

308 void (*ic_bar_response)(struct ieee80211_node *,
309 struct ieee80211_tx_ampdu *, int status);
310 /* start/stop doing A-MPDU rx processing for a station */
311 int (*ic_ampdu_rx_start)(struct ieee80211_node *,
312 struct ieee80211_rx_ampdu *, int baparamset,
313 int batimeout, int baseqctl);
314 void (*ic_ampdu_rx_stop)(struct ieee80211_node *,
315 struct ieee80211_rx_ampdu *);
141 uint32_t ic_cryptocaps; /* crypto capabilities */
142 uint8_t ic_modecaps[2]; /* set of mode capabilities */
143 uint8_t ic_promisc; /* vap's needing promisc mode */
144 uint8_t ic_allmulti; /* vap's needing all multicast*/
145 uint8_t ic_nrunning; /* vap's marked running */
146 uint8_t ic_curmode; /* current mode */
147 uint16_t ic_bintval; /* beacon interval */
148 uint16_t ic_lintval; /* listen interval */

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

309 void (*ic_bar_response)(struct ieee80211_node *,
310 struct ieee80211_tx_ampdu *, int status);
311 /* start/stop doing A-MPDU rx processing for a station */
312 int (*ic_ampdu_rx_start)(struct ieee80211_node *,
313 struct ieee80211_rx_ampdu *, int baparamset,
314 int batimeout, int baseqctl);
315 void (*ic_ampdu_rx_stop)(struct ieee80211_node *,
316 struct ieee80211_rx_ampdu *);
316 uint64_t ic_spare[8];
317 uint64_t ic_spare[7];
318 uint32_t ic_spare2;
317};
318
319struct ieee80211_aclator;
320struct ieee80211_tdma_state;
321struct ieee80211_mesh_state;
322struct ieee80211_hwmp_state;
323
324struct ieee80211vap {

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

335
336 uint8_t iv_myaddr[IEEE80211_ADDR_LEN];
337 uint32_t iv_flags; /* state flags */
338 uint32_t iv_flags_ext; /* extended state flags */
339 uint32_t iv_flags_ht; /* HT state flags */
340 uint32_t iv_flags_ven; /* vendor state flags */
341 uint32_t iv_caps; /* capabilities */
342 uint32_t iv_htcaps; /* HT capabilities */
319};
320
321struct ieee80211_aclator;
322struct ieee80211_tdma_state;
323struct ieee80211_mesh_state;
324struct ieee80211_hwmp_state;
325
326struct ieee80211vap {

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

337
338 uint8_t iv_myaddr[IEEE80211_ADDR_LEN];
339 uint32_t iv_flags; /* state flags */
340 uint32_t iv_flags_ext; /* extended state flags */
341 uint32_t iv_flags_ht; /* HT state flags */
342 uint32_t iv_flags_ven; /* vendor state flags */
343 uint32_t iv_caps; /* capabilities */
344 uint32_t iv_htcaps; /* HT capabilities */
345 uint32_t iv_htextcaps; /* HT extended capabilities */
343 enum ieee80211_opmode iv_opmode; /* operation mode */
344 enum ieee80211_state iv_state; /* state machine state */
345 enum ieee80211_state iv_nstate; /* pending state */
346 int iv_nstate_arg; /* pending state arg */
347 struct task iv_nstate_task; /* deferred state processing */
348 struct task iv_swbmiss_task;/* deferred iv_bmiss call */
349 struct callout iv_mgtsend; /* mgmt frame response timer */
350 /* inactivity timer settings */

--- 563 unchanged lines hidden ---
346 enum ieee80211_opmode iv_opmode; /* operation mode */
347 enum ieee80211_state iv_state; /* state machine state */
348 enum ieee80211_state iv_nstate; /* pending state */
349 int iv_nstate_arg; /* pending state arg */
350 struct task iv_nstate_task; /* deferred state processing */
351 struct task iv_swbmiss_task;/* deferred iv_bmiss call */
352 struct callout iv_mgtsend; /* mgmt frame response timer */
353 /* inactivity timer settings */

--- 563 unchanged lines hidden ---