Deleted Added
full compact
ieee80211_node.h (192468) ieee80211_node.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_node.h 192468 2009-05-20 20:00:40Z sam $
26 * $FreeBSD: head/sys/net80211/ieee80211_node.h 193239 2009-06-01 16:36:28Z sam $
27 */
28#ifndef _NET80211_IEEE80211_NODE_H_
29#define _NET80211_IEEE80211_NODE_H_
30
31#include <net80211/ieee80211_ioctl.h> /* for ieee80211_nodestats */
32#include <net80211/ieee80211_ht.h> /* for aggregation state */
33
34/*

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

76 /* the following are either NULL or point within data */
77 uint8_t *wpa_ie; /* captured WPA ie */
78 uint8_t *rsn_ie; /* captured RSN ie */
79 uint8_t *wme_ie; /* captured WME ie */
80 uint8_t *ath_ie; /* captured Atheros ie */
81 uint8_t *htcap_ie; /* captured HTCAP ie */
82 uint8_t *htinfo_ie; /* captured HTINFO ie */
83 uint8_t *tdma_ie; /* captured TDMA ie */
27 */
28#ifndef _NET80211_IEEE80211_NODE_H_
29#define _NET80211_IEEE80211_NODE_H_
30
31#include <net80211/ieee80211_ioctl.h> /* for ieee80211_nodestats */
32#include <net80211/ieee80211_ht.h> /* for aggregation state */
33
34/*

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

76 /* the following are either NULL or point within data */
77 uint8_t *wpa_ie; /* captured WPA ie */
78 uint8_t *rsn_ie; /* captured RSN ie */
79 uint8_t *wme_ie; /* captured WME ie */
80 uint8_t *ath_ie; /* captured Atheros ie */
81 uint8_t *htcap_ie; /* captured HTCAP ie */
82 uint8_t *htinfo_ie; /* captured HTINFO ie */
83 uint8_t *tdma_ie; /* captured TDMA ie */
84 uint8_t *spare[4];
84 /* NB: these must be the last members of this structure */
85 uint8_t *data; /* frame data > 802.11 header */
86 int len; /* data size in bytes */
87};
88
89/*
90 * Node specific information. Note that drivers are expected
91 * to derive from this structure to add device-specific per-node

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

187 short ni_inact_reload;/* inactivity reload value */
188 int ni_txrate; /* legacy rate/MCS */
189 struct ieee80211_psq ni_psq; /* power save queue */
190 struct ieee80211_nodestats ni_stats; /* per-node statistics */
191
192 struct ieee80211vap *ni_wdsvap; /* associated WDS vap */
193 /* XXX move to vap? */
194 struct ifqueue ni_wdsq; /* wds pending queue */
85 /* NB: these must be the last members of this structure */
86 uint8_t *data; /* frame data > 802.11 header */
87 int len; /* data size in bytes */
88};
89
90/*
91 * Node specific information. Note that drivers are expected
92 * to derive from this structure to add device-specific per-node

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

188 short ni_inact_reload;/* inactivity reload value */
189 int ni_txrate; /* legacy rate/MCS */
190 struct ieee80211_psq ni_psq; /* power save queue */
191 struct ieee80211_nodestats ni_stats; /* per-node statistics */
192
193 struct ieee80211vap *ni_wdsvap; /* associated WDS vap */
194 /* XXX move to vap? */
195 struct ifqueue ni_wdsq; /* wds pending queue */
196 uint64_t ni_spare[4];
195};
196MALLOC_DECLARE(M_80211_NODE);
197MALLOC_DECLARE(M_80211_NODE_IE);
198
199#define IEEE80211_NODE_ATH (IEEE80211_NODE_FF | IEEE80211_NODE_TURBOP)
200#define IEEE80211_NODE_AMPDU \
201 (IEEE80211_NODE_AMPDU_RX | IEEE80211_NODE_AMPDU_TX)
202#define IEEE80211_NODE_HT_ALL \

--- 223 unchanged lines hidden ---
197};
198MALLOC_DECLARE(M_80211_NODE);
199MALLOC_DECLARE(M_80211_NODE_IE);
200
201#define IEEE80211_NODE_ATH (IEEE80211_NODE_FF | IEEE80211_NODE_TURBOP)
202#define IEEE80211_NODE_AMPDU \
203 (IEEE80211_NODE_AMPDU_RX | IEEE80211_NODE_AMPDU_TX)
204#define IEEE80211_NODE_HT_ALL \

--- 223 unchanged lines hidden ---