Deleted Added
full compact
ieee80211_node.h (183252) ieee80211_node.h (183255)
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 183252 2008-09-21 23:31:17Z sam $
26 * $FreeBSD: head/sys/net80211/ieee80211_node.h 183255 2008-09-21 23:59:14Z 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/*

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

107#define IEEE80211_NODE_PWR_MGT 0x000010 /* power save mode enabled */
108#define IEEE80211_NODE_AREF 0x000020 /* authentication ref held */
109#define IEEE80211_NODE_HT 0x000040 /* HT enabled */
110#define IEEE80211_NODE_HTCOMPAT 0x000080 /* HT setup w/ vendor OUI's */
111#define IEEE80211_NODE_WPS 0x000100 /* WPS association */
112#define IEEE80211_NODE_TSN 0x000200 /* TSN association */
113#define IEEE80211_NODE_AMPDU_RX 0x000400 /* AMPDU rx enabled */
114#define IEEE80211_NODE_AMPDU_TX 0x000800 /* AMPDU tx enabled */
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/*

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

107#define IEEE80211_NODE_PWR_MGT 0x000010 /* power save mode enabled */
108#define IEEE80211_NODE_AREF 0x000020 /* authentication ref held */
109#define IEEE80211_NODE_HT 0x000040 /* HT enabled */
110#define IEEE80211_NODE_HTCOMPAT 0x000080 /* HT setup w/ vendor OUI's */
111#define IEEE80211_NODE_WPS 0x000100 /* WPS association */
112#define IEEE80211_NODE_TSN 0x000200 /* TSN association */
113#define IEEE80211_NODE_AMPDU_RX 0x000400 /* AMPDU rx enabled */
114#define IEEE80211_NODE_AMPDU_TX 0x000800 /* AMPDU tx enabled */
115#define IEEE80211_NODE_MIMO_PS 0x001000 /* MIMO power save enabled */
116#define IEEE80211_NODE_MIMO_RTS 0x002000 /* send RTS in MIMO PS */
115 uint16_t ni_associd; /* association ID */
116 uint16_t ni_vlan; /* vlan tag */
117 uint16_t ni_txpower; /* current transmit power */
118 uint8_t ni_authmode; /* authentication algorithm */
119 uint8_t ni_ath_flags; /* Atheros feature flags */
120 /* NB: These must have the same values as IEEE80211_ATHC_* */
121#define IEEE80211_NODE_TURBOP 0x0001 /* Turbo prime enable */
122#define IEEE80211_NODE_COMP 0x0002 /* Compresssion enable */

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

190MALLOC_DECLARE(M_80211_NODE);
191MALLOC_DECLARE(M_80211_NODE_IE);
192
193#define IEEE80211_NODE_ATH (IEEE80211_NODE_FF | IEEE80211_NODE_TURBOP)
194#define IEEE80211_NODE_AMPDU \
195 (IEEE80211_NODE_AMPDU_RX | IEEE80211_NODE_AMPDU_TX)
196#define IEEE80211_NODE_HT_ALL \
197 (IEEE80211_NODE_HT | IEEE80211_NODE_HTCOMPAT | \
117 uint16_t ni_associd; /* association ID */
118 uint16_t ni_vlan; /* vlan tag */
119 uint16_t ni_txpower; /* current transmit power */
120 uint8_t ni_authmode; /* authentication algorithm */
121 uint8_t ni_ath_flags; /* Atheros feature flags */
122 /* NB: These must have the same values as IEEE80211_ATHC_* */
123#define IEEE80211_NODE_TURBOP 0x0001 /* Turbo prime enable */
124#define IEEE80211_NODE_COMP 0x0002 /* Compresssion enable */

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

192MALLOC_DECLARE(M_80211_NODE);
193MALLOC_DECLARE(M_80211_NODE_IE);
194
195#define IEEE80211_NODE_ATH (IEEE80211_NODE_FF | IEEE80211_NODE_TURBOP)
196#define IEEE80211_NODE_AMPDU \
197 (IEEE80211_NODE_AMPDU_RX | IEEE80211_NODE_AMPDU_TX)
198#define IEEE80211_NODE_HT_ALL \
199 (IEEE80211_NODE_HT | IEEE80211_NODE_HTCOMPAT | \
198 IEEE80211_NODE_AMPDU)
200 IEEE80211_NODE_AMPDU | IEEE80211_NODE_MIMO_PS | \
201 IEEE80211_NODE_MIMO_RTS)
199
200#define IEEE80211_NODE_AID(ni) IEEE80211_AID(ni->ni_associd)
201
202#define IEEE80211_NODE_STAT(ni,stat) (ni->ni_stats.ns_##stat++)
203#define IEEE80211_NODE_STAT_ADD(ni,stat,v) (ni->ni_stats.ns_##stat += v)
204#define IEEE80211_NODE_STAT_SET(ni,stat,v) (ni->ni_stats.ns_##stat = v)
205
206/*

--- 204 unchanged lines hidden ---
202
203#define IEEE80211_NODE_AID(ni) IEEE80211_AID(ni->ni_associd)
204
205#define IEEE80211_NODE_STAT(ni,stat) (ni->ni_stats.ns_##stat++)
206#define IEEE80211_NODE_STAT_ADD(ni,stat,v) (ni->ni_stats.ns_##stat += v)
207#define IEEE80211_NODE_STAT_SET(ni,stat,v) (ni->ni_stats.ns_##stat = v)
208
209/*

--- 204 unchanged lines hidden ---