Deleted Added
full compact
ieee80211_node.h (172225) ieee80211_node.h (173273)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2007 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-2007 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 172225 2007-09-18 20:40:21Z sam $
26 * $FreeBSD: head/sys/net80211/ieee80211_node.h 173273 2007-11-02 05:22:25Z 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/*

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

106#define IEEE80211_NODE_AUTH 0x0001 /* authorized for data */
107#define IEEE80211_NODE_QOS 0x0002 /* QoS enabled */
108#define IEEE80211_NODE_ERP 0x0004 /* ERP enabled */
109/* NB: this must have the same value as IEEE80211_FC1_PWR_MGT */
110#define IEEE80211_NODE_PWR_MGT 0x0010 /* power save mode enabled */
111#define IEEE80211_NODE_AREF 0x0020 /* authentication ref held */
112#define IEEE80211_NODE_HT 0x0040 /* HT enabled */
113#define IEEE80211_NODE_HTCOMPAT 0x0080 /* HT setup w/ vendor OUI's */
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/*

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

106#define IEEE80211_NODE_AUTH 0x0001 /* authorized for data */
107#define IEEE80211_NODE_QOS 0x0002 /* QoS enabled */
108#define IEEE80211_NODE_ERP 0x0004 /* ERP enabled */
109/* NB: this must have the same value as IEEE80211_FC1_PWR_MGT */
110#define IEEE80211_NODE_PWR_MGT 0x0010 /* power save mode enabled */
111#define IEEE80211_NODE_AREF 0x0020 /* authentication ref held */
112#define IEEE80211_NODE_HT 0x0040 /* HT enabled */
113#define IEEE80211_NODE_HTCOMPAT 0x0080 /* HT setup w/ vendor OUI's */
114#define IEEE80211_NODE_AMPDU_RX 0x0400 /* AMPDU rx enabled */
115#define IEEE80211_NODE_AMPDU_TX 0x0800 /* AMPDU tx enabled */
114 uint16_t ni_ath_defkeyix;/* Atheros def key index */
115 uint16_t ni_associd; /* assoc response */
116 uint16_t ni_txpower; /* current transmit power */
117 uint16_t ni_vlan; /* vlan tag */
116 uint16_t ni_ath_defkeyix;/* Atheros def key index */
117 uint16_t ni_associd; /* assoc response */
118 uint16_t ni_txpower; /* current transmit power */
119 uint16_t ni_vlan; /* vlan tag */
120 uint32_t ni_jointime; /* time of join (secs) */
118 uint32_t *ni_challenge; /* shared-key challenge */
119 uint8_t *ni_wpa_ie; /* captured WPA ie */
120 uint8_t *ni_rsn_ie; /* captured RSN ie */
121 uint8_t *ni_wme_ie; /* captured WME ie */
122 uint8_t *ni_ath_ie; /* captured Atheros ie */
123 /* tx seq per-tid */
124 uint16_t ni_txseqs[IEEE80211_TID_SIZE];
125 /* rx seq previous per-tid*/

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

152 uint16_t ni_fhdwell; /* FH only */
153 uint8_t ni_fhindex; /* FH only */
154 uint8_t ni_erp; /* ERP from beacon/probe resp */
155 uint16_t ni_timoff; /* byte offset to TIM ie */
156 uint8_t ni_dtim_period; /* DTIM period */
157 uint8_t ni_dtim_count; /* DTIM count for last bcn */
158
159 /* 11n state */
121 uint32_t *ni_challenge; /* shared-key challenge */
122 uint8_t *ni_wpa_ie; /* captured WPA ie */
123 uint8_t *ni_rsn_ie; /* captured RSN ie */
124 uint8_t *ni_wme_ie; /* captured WME ie */
125 uint8_t *ni_ath_ie; /* captured Atheros ie */
126 /* tx seq per-tid */
127 uint16_t ni_txseqs[IEEE80211_TID_SIZE];
128 /* rx seq previous per-tid*/

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

155 uint16_t ni_fhdwell; /* FH only */
156 uint8_t ni_fhindex; /* FH only */
157 uint8_t ni_erp; /* ERP from beacon/probe resp */
158 uint16_t ni_timoff; /* byte offset to TIM ie */
159 uint8_t ni_dtim_period; /* DTIM period */
160 uint8_t ni_dtim_count; /* DTIM count for last bcn */
161
162 /* 11n state */
163 uint8_t *ni_htcap_ie; /* captured HTCAP ie */
160 uint16_t ni_htcap; /* HT capabilities */
161 uint8_t ni_htparam; /* HT params */
162 uint8_t ni_htctlchan; /* HT control channel */
163 uint8_t ni_ht2ndchan; /* HT 2nd channel */
164 uint8_t ni_htopmode; /* HT operating mode */
165 uint8_t ni_htstbc; /* HT */
166 uint8_t ni_reqcw; /* requested tx channel width */
167 uint8_t ni_chw; /* negotiated channel width */

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

175 short ni_inact_reload;/* inactivity reload value */
176 int ni_txrate; /* index to ni_rates[] */
177 struct ifqueue ni_savedq; /* ps-poll queue */
178 struct ieee80211_nodestats ni_stats; /* per-node statistics */
179};
180MALLOC_DECLARE(M_80211_NODE);
181
182#define IEEE80211_NODE_ATH (IEEE80211_NODE_FF | IEEE80211_NODE_TURBOP)
164 uint16_t ni_htcap; /* HT capabilities */
165 uint8_t ni_htparam; /* HT params */
166 uint8_t ni_htctlchan; /* HT control channel */
167 uint8_t ni_ht2ndchan; /* HT 2nd channel */
168 uint8_t ni_htopmode; /* HT operating mode */
169 uint8_t ni_htstbc; /* HT */
170 uint8_t ni_reqcw; /* requested tx channel width */
171 uint8_t ni_chw; /* negotiated channel width */

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

179 short ni_inact_reload;/* inactivity reload value */
180 int ni_txrate; /* index to ni_rates[] */
181 struct ifqueue ni_savedq; /* ps-poll queue */
182 struct ieee80211_nodestats ni_stats; /* per-node statistics */
183};
184MALLOC_DECLARE(M_80211_NODE);
185
186#define IEEE80211_NODE_ATH (IEEE80211_NODE_FF | IEEE80211_NODE_TURBOP)
187#define IEEE80211_NODE_AMPDU \
188 (IEEE80211_NODE_AMPDU_RX | IEEE80211_NODE_AMPDU_TX)
183
184#define IEEE80211_NODE_AID(ni) IEEE80211_AID(ni->ni_associd)
185
186#define IEEE80211_NODE_STAT(ni,stat) (ni->ni_stats.ns_##stat++)
187#define IEEE80211_NODE_STAT_ADD(ni,stat,v) (ni->ni_stats.ns_##stat += v)
188#define IEEE80211_NODE_STAT_SET(ni,stat,v) (ni->ni_stats.ns_##stat = v)
189
190static __inline struct ieee80211_node *

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

214}
215
216void ieee80211_node_authorize(struct ieee80211_node *);
217void ieee80211_node_unauthorize(struct ieee80211_node *);
218
219void ieee80211_probe_curchan(struct ieee80211com *, int);
220void ieee80211_create_ibss(struct ieee80211com*, struct ieee80211_channel *);
221void ieee80211_reset_bss(struct ieee80211com *);
189
190#define IEEE80211_NODE_AID(ni) IEEE80211_AID(ni->ni_associd)
191
192#define IEEE80211_NODE_STAT(ni,stat) (ni->ni_stats.ns_##stat++)
193#define IEEE80211_NODE_STAT_ADD(ni,stat,v) (ni->ni_stats.ns_##stat += v)
194#define IEEE80211_NODE_STAT_SET(ni,stat,v) (ni->ni_stats.ns_##stat = v)
195
196static __inline struct ieee80211_node *

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

220}
221
222void ieee80211_node_authorize(struct ieee80211_node *);
223void ieee80211_node_unauthorize(struct ieee80211_node *);
224
225void ieee80211_probe_curchan(struct ieee80211com *, int);
226void ieee80211_create_ibss(struct ieee80211com*, struct ieee80211_channel *);
227void ieee80211_reset_bss(struct ieee80211com *);
228void ieee80211_setbsschan(struct ieee80211com *, struct ieee80211_channel *);
222int ieee80211_ibss_merge(struct ieee80211_node *);
223struct ieee80211_scan_entry;
224int ieee80211_sta_join(struct ieee80211com *,
225 const struct ieee80211_scan_entry *);
226void ieee80211_sta_leave(struct ieee80211com *, struct ieee80211_node *);
227
228/*
229 * Table of ieee80211_node instances. Each ieee80211com

--- 100 unchanged lines hidden ---
229int ieee80211_ibss_merge(struct ieee80211_node *);
230struct ieee80211_scan_entry;
231int ieee80211_sta_join(struct ieee80211com *,
232 const struct ieee80211_scan_entry *);
233void ieee80211_sta_leave(struct ieee80211com *, struct ieee80211_node *);
234
235/*
236 * Table of ieee80211_node instances. Each ieee80211com

--- 100 unchanged lines hidden ---