Deleted Added
full compact
ieee80211_var.h (228621) ieee80211_var.h (233452)
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 228621 2011-12-17 10:23:17Z bschmidt $
26 * $FreeBSD: head/sys/net80211/ieee80211_var.h 233452 2012-03-25 03:11:57Z adrian $
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 */

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

125 struct ifmedia ic_media; /* interface media config */
126 struct callout ic_inact; /* inactivity processing */
127 struct taskqueue *ic_tq; /* deferred state thread */
128 struct task ic_parent_task; /* deferred parent processing */
129 struct task ic_promisc_task;/* deferred promisc update */
130 struct task ic_mcast_task; /* deferred mcast update */
131 struct task ic_chan_task; /* deferred channel change */
132 struct task ic_bmiss_task; /* deferred beacon miss hndlr */
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 */

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

125 struct ifmedia ic_media; /* interface media config */
126 struct callout ic_inact; /* inactivity processing */
127 struct taskqueue *ic_tq; /* deferred state thread */
128 struct task ic_parent_task; /* deferred parent processing */
129 struct task ic_promisc_task;/* deferred promisc update */
130 struct task ic_mcast_task; /* deferred mcast update */
131 struct task ic_chan_task; /* deferred channel change */
132 struct task ic_bmiss_task; /* deferred beacon miss hndlr */
133 struct task ic_chw_task; /* deferred HT CHW update */
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 */

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

317 void (*ic_bar_response)(struct ieee80211_node *,
318 struct ieee80211_tx_ampdu *, int status);
319 /* start/stop doing A-MPDU rx processing for a station */
320 int (*ic_ampdu_rx_start)(struct ieee80211_node *,
321 struct ieee80211_rx_ampdu *, int baparamset,
322 int batimeout, int baseqctl);
323 void (*ic_ampdu_rx_stop)(struct ieee80211_node *,
324 struct ieee80211_rx_ampdu *);
134
135 uint32_t ic_flags; /* state flags */
136 uint32_t ic_flags_ext; /* extended state flags */
137 uint32_t ic_flags_ht; /* HT state flags */
138 uint32_t ic_flags_ven; /* vendor state flags */
139 uint32_t ic_caps; /* capabilities */
140 uint32_t ic_htcaps; /* HT capabilities */
141 uint32_t ic_htextcaps; /* HT extended capabilities */

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

318 void (*ic_bar_response)(struct ieee80211_node *,
319 struct ieee80211_tx_ampdu *, int status);
320 /* start/stop doing A-MPDU rx processing for a station */
321 int (*ic_ampdu_rx_start)(struct ieee80211_node *,
322 struct ieee80211_rx_ampdu *, int baparamset,
323 int batimeout, int baseqctl);
324 void (*ic_ampdu_rx_stop)(struct ieee80211_node *,
325 struct ieee80211_rx_ampdu *);
326
327 /* The channel width has changed (20<->2040) */
328 void (*ic_update_chw)(struct ieee80211com *);
329
325 uint64_t ic_spare[7];
326};
327
328struct ieee80211_aclator;
329struct ieee80211_tdma_state;
330struct ieee80211_mesh_state;
331struct ieee80211_hwmp_state;
332

--- 605 unchanged lines hidden ---
330 uint64_t ic_spare[7];
331};
332
333struct ieee80211_aclator;
334struct ieee80211_tdma_state;
335struct ieee80211_mesh_state;
336struct ieee80211_hwmp_state;
337

--- 605 unchanged lines hidden ---