Deleted Added
full compact
ieee80211_node.h (184274) ieee80211_node.h (184288)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2008 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-2008 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 184274 2008-10-25 23:32:24Z sam $
26 * $FreeBSD: head/sys/net80211/ieee80211_node.h 184288 2008-10-26 01:04:46Z 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/*

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

180 struct ieee80211_htrateset ni_htrates; /* negotiated ht rate set */
181 struct ieee80211_tx_ampdu ni_tx_ampdu[WME_NUM_AC];
182 struct ieee80211_rx_ampdu ni_rx_ampdu[WME_NUM_TID];
183
184 /* others */
185 short ni_inact; /* inactivity mark count */
186 short ni_inact_reload;/* inactivity reload value */
187 int ni_txrate; /* legacy rate/MCS */
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/*

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

180 struct ieee80211_htrateset ni_htrates; /* negotiated ht rate set */
181 struct ieee80211_tx_ampdu ni_tx_ampdu[WME_NUM_AC];
182 struct ieee80211_rx_ampdu ni_rx_ampdu[WME_NUM_TID];
183
184 /* others */
185 short ni_inact; /* inactivity mark count */
186 short ni_inact_reload;/* inactivity reload value */
187 int ni_txrate; /* legacy rate/MCS */
188 struct ifqueue ni_savedq; /* ps-poll queue */
188 struct ieee80211_psq ni_psq; /* power save queue */
189 struct ieee80211_nodestats ni_stats; /* per-node statistics */
190
191 struct ieee80211vap *ni_wdsvap; /* associated WDS vap */
192 /* XXX move to vap? */
193 struct ifqueue ni_wdsq; /* wds pending queue */
194};
195MALLOC_DECLARE(M_80211_NODE);
196MALLOC_DECLARE(M_80211_NODE_IE);

--- 221 unchanged lines hidden ---
189 struct ieee80211_nodestats ni_stats; /* per-node statistics */
190
191 struct ieee80211vap *ni_wdsvap; /* associated WDS vap */
192 /* XXX move to vap? */
193 struct ifqueue ni_wdsq; /* wds pending queue */
194};
195MALLOC_DECLARE(M_80211_NODE);
196MALLOC_DECLARE(M_80211_NODE_IE);

--- 221 unchanged lines hidden ---