Deleted Added
full compact
ieee80211_var.h (192468) ieee80211_var.h (193239)
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 192468 2009-05-20 20:00:40Z sam $
26 * $FreeBSD: head/sys/net80211/ieee80211_var.h 193239 2009-06-01 16:36:28Z 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 */

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

302 void (*ic_bar_response)(struct ieee80211_node *,
303 struct ieee80211_tx_ampdu *, int status);
304 /* start/stop doing A-MPDU rx processing for a station */
305 int (*ic_ampdu_rx_start)(struct ieee80211_node *,
306 struct ieee80211_rx_ampdu *, int baparamset,
307 int batimeout, int baseqctl);
308 void (*ic_ampdu_rx_stop)(struct ieee80211_node *,
309 struct ieee80211_rx_ampdu *);
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 */

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

302 void (*ic_bar_response)(struct ieee80211_node *,
303 struct ieee80211_tx_ampdu *, int status);
304 /* start/stop doing A-MPDU rx processing for a station */
305 int (*ic_ampdu_rx_start)(struct ieee80211_node *,
306 struct ieee80211_rx_ampdu *, int baparamset,
307 int batimeout, int baseqctl);
308 void (*ic_ampdu_rx_stop)(struct ieee80211_node *,
309 struct ieee80211_rx_ampdu *);
310 uint64_t ic_spare[8];
310};
311
312struct ieee80211_aclator;
313struct ieee80211_tdma_state;
314
315struct ieee80211vap {
316 struct ifmedia iv_media; /* interface media config */
317 struct ifnet *iv_ifp; /* associated device */

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

451 void (*iv_update_ps)(struct ieee80211vap *, int);
452 int (*iv_set_tim)(struct ieee80211_node *, int);
453 /* state machine processing */
454 int (*iv_newstate)(struct ieee80211vap *,
455 enum ieee80211_state, int);
456 /* 802.3 output method for raw frame xmit */
457 int (*iv_output)(struct ifnet *, struct mbuf *,
458 struct sockaddr *, struct route *);
311};
312
313struct ieee80211_aclator;
314struct ieee80211_tdma_state;
315
316struct ieee80211vap {
317 struct ifmedia iv_media; /* interface media config */
318 struct ifnet *iv_ifp; /* associated device */

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

452 void (*iv_update_ps)(struct ieee80211vap *, int);
453 int (*iv_set_tim)(struct ieee80211_node *, int);
454 /* state machine processing */
455 int (*iv_newstate)(struct ieee80211vap *,
456 enum ieee80211_state, int);
457 /* 802.3 output method for raw frame xmit */
458 int (*iv_output)(struct ifnet *, struct mbuf *,
459 struct sockaddr *, struct route *);
460 uint64_t iv_spare[8];
459};
460MALLOC_DECLARE(M_80211_VAP);
461
462#define IEEE80211_ADDR_EQ(a1,a2) (memcmp(a1,a2,IEEE80211_ADDR_LEN) == 0)
463#define IEEE80211_ADDR_COPY(dst,src) memcpy(dst,src,IEEE80211_ADDR_LEN)
464
465/* ic_flags/iv_flags */
466#define IEEE80211_F_TURBOP 0x00000001 /* CONF: ATH Turbo enabled*/

--- 420 unchanged lines hidden ---
461};
462MALLOC_DECLARE(M_80211_VAP);
463
464#define IEEE80211_ADDR_EQ(a1,a2) (memcmp(a1,a2,IEEE80211_ADDR_LEN) == 0)
465#define IEEE80211_ADDR_COPY(dst,src) memcpy(dst,src,IEEE80211_ADDR_LEN)
466
467/* ic_flags/iv_flags */
468#define IEEE80211_F_TURBOP 0x00000001 /* CONF: ATH Turbo enabled*/

--- 420 unchanged lines hidden ---