Deleted Added
full compact
ieee80211_var.h (193655) ieee80211_var.h (195377)
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 193655 2009-06-07 22:00:22Z sam $
26 * $FreeBSD: head/sys/net80211/ieee80211_var.h 195377 2009-07-05 17:59:19Z sam $
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 */

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

107 uint8_t ie_data[]; /* user-specified IE's */
108};
109
110struct ieee80211_tdma_param;
111struct ieee80211_rate_table;
112struct ieee80211_tx_ampdu;
113struct ieee80211_rx_ampdu;
114struct ieee80211_superg;
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 */

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

107 uint8_t ie_data[]; /* user-specified IE's */
108};
109
110struct ieee80211_tdma_param;
111struct ieee80211_rate_table;
112struct ieee80211_tx_ampdu;
113struct ieee80211_rx_ampdu;
114struct ieee80211_superg;
115struct ieee80211_frame;
115
116struct ieee80211com {
117 struct ifnet *ic_ifp; /* associated device */
118 ieee80211_com_lock_t ic_comlock; /* state update lock */
119 TAILQ_HEAD(, ieee80211vap) ic_vaps; /* list of vap instances */
120 int ic_headroom; /* driver tx headroom needs */
121 enum ieee80211_phytype ic_phytype; /* XXX wrong for multi-mode */
122 enum ieee80211_opmode ic_opmode; /* operation mode */

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

277 /*
278 * 802.11n ADDBA support. A simple/generic implementation
279 * of A-MPDU tx aggregation is provided; the driver may
280 * override these methods to provide their own support.
281 * A-MPDU rx re-ordering happens automatically if the
282 * driver passes out-of-order frames to ieee80211_input
283 * from an assocated HT station.
284 */
116
117struct ieee80211com {
118 struct ifnet *ic_ifp; /* associated device */
119 ieee80211_com_lock_t ic_comlock; /* state update lock */
120 TAILQ_HEAD(, ieee80211vap) ic_vaps; /* list of vap instances */
121 int ic_headroom; /* driver tx headroom needs */
122 enum ieee80211_phytype ic_phytype; /* XXX wrong for multi-mode */
123 enum ieee80211_opmode ic_opmode; /* operation mode */

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

278 /*
279 * 802.11n ADDBA support. A simple/generic implementation
280 * of A-MPDU tx aggregation is provided; the driver may
281 * override these methods to provide their own support.
282 * A-MPDU rx re-ordering happens automatically if the
283 * driver passes out-of-order frames to ieee80211_input
284 * from an assocated HT station.
285 */
285 void (*ic_recv_action)(struct ieee80211_node *,
286 int (*ic_recv_action)(struct ieee80211_node *,
287 const struct ieee80211_frame *,
286 const uint8_t *frm, const uint8_t *efrm);
287 int (*ic_send_action)(struct ieee80211_node *,
288 const uint8_t *frm, const uint8_t *efrm);
289 int (*ic_send_action)(struct ieee80211_node *,
288 int category, int action,
289 uint16_t args[4]);
290 int category, int action, void *);
290 /* check if A-MPDU should be enabled this station+ac */
291 int (*ic_ampdu_enable)(struct ieee80211_node *,
292 struct ieee80211_tx_ampdu *);
293 /* start/stop doing A-MPDU tx aggregation for a station */
294 int (*ic_addba_request)(struct ieee80211_node *,
295 struct ieee80211_tx_ampdu *,
296 int dialogtoken, int baparamset,
297 int batimeout);

--- 604 unchanged lines hidden ---
291 /* check if A-MPDU should be enabled this station+ac */
292 int (*ic_ampdu_enable)(struct ieee80211_node *,
293 struct ieee80211_tx_ampdu *);
294 /* start/stop doing A-MPDU tx aggregation for a station */
295 int (*ic_addba_request)(struct ieee80211_node *,
296 struct ieee80211_tx_ampdu *,
297 int dialogtoken, int baparamset,
298 int batimeout);

--- 604 unchanged lines hidden ---