Deleted Added
full compact
ieee80211_node.h (233452) ieee80211_node.h (234324)
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 233452 2012-03-25 03:11:57Z adrian $
26 * $FreeBSD: head/sys/net80211/ieee80211_node.h 234324 2012-04-15 20:29:39Z adrian $
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/*

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

209 uint16_t ni_htcap; /* HT capabilities */
210 uint8_t ni_htparam; /* HT params */
211 uint8_t ni_htctlchan; /* HT control channel */
212 uint8_t ni_ht2ndchan; /* HT 2nd channel */
213 uint8_t ni_htopmode; /* HT operating mode */
214 uint8_t ni_htstbc; /* HT */
215 uint8_t ni_chw; /* negotiated channel width */
216 struct ieee80211_htrateset ni_htrates; /* negotiated ht rate set */
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/*

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

209 uint16_t ni_htcap; /* HT capabilities */
210 uint8_t ni_htparam; /* HT params */
211 uint8_t ni_htctlchan; /* HT control channel */
212 uint8_t ni_ht2ndchan; /* HT 2nd channel */
213 uint8_t ni_htopmode; /* HT operating mode */
214 uint8_t ni_htstbc; /* HT */
215 uint8_t ni_chw; /* negotiated channel width */
216 struct ieee80211_htrateset ni_htrates; /* negotiated ht rate set */
217 struct ieee80211_tx_ampdu ni_tx_ampdu[WME_NUM_AC];
217 struct ieee80211_tx_ampdu ni_tx_ampdu[WME_NUM_TID];
218 struct ieee80211_rx_ampdu ni_rx_ampdu[WME_NUM_TID];
219
220 /* others */
221 short ni_inact; /* inactivity mark count */
222 short ni_inact_reload;/* inactivity reload value */
223 int ni_txrate; /* legacy rate/MCS */
224 struct ieee80211_psq ni_psq; /* power save queue */
225 struct ieee80211_nodestats ni_stats; /* per-node statistics */

--- 237 unchanged lines hidden ---
218 struct ieee80211_rx_ampdu ni_rx_ampdu[WME_NUM_TID];
219
220 /* others */
221 short ni_inact; /* inactivity mark count */
222 short ni_inact_reload;/* inactivity reload value */
223 int ni_txrate; /* legacy rate/MCS */
224 struct ieee80211_psq ni_psq; /* power save queue */
225 struct ieee80211_nodestats ni_stats; /* per-node statistics */

--- 237 unchanged lines hidden ---