d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o move IEEE80211_NONQOS_TID into a public location

Browse Source 
o add IEEE80211_TID_SIZE and replace all the nake constants

Approved by:	re (blanket wireless)
This commit is contained in:
sam 2007-09-18 20:40:21 +00:00
parent 1f33ce6db9
commit 20c40e534c
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/net80211/_ieee80211.h
View File

@ -261,6 +261,9 @@ struct ieee80211_channel {
#define IEEE80211_FH_CHANSET(chan) ((chan)/IEEE80211_FH_CHANMOD+1)
#define IEEE80211_FH_CHANPAT(chan) ((chan)%IEEE80211_FH_CHANMOD)
#define IEEE80211_TID_SIZE (WME_NUM_TID+1) /* WME TID's +1 for non-QoS */
#define IEEE80211_NONQOS_TID WME_NUM_TID /* index for non-QoS sta */
/*
* 802.11 rate set.
*/

5
sys/net80211/ieee80211_ioctl.h
View File

@ -336,8 +336,9 @@ struct ieee80211req_sta_info {
uint16_t isi_associd; /* assoc response */
uint16_t isi_txpower; /* current tx power */
uint16_t isi_vlan; /* vlan tag */
uint16_t isi_txseqs[17]; /* seq to be transmitted */
uint16_t isi_rxseqs[17]; /* seq previous for qos frames*/
/* NB: [IEEE80211_NONQOS_TID] holds seq#'s for non-QoS stations */
uint16_t isi_txseqs[IEEE80211_TID_SIZE];/* tx seq #/TID */
uint16_t isi_rxseqs[IEEE80211_TID_SIZE];/* rx seq#/TID */
uint16_t isi_inact; /* inactivity timer */
/* XXX frag state? */
/* variable length IE data */

7
sys/net80211/ieee80211_node.h
View File

@ -120,9 +120,10 @@ struct ieee80211_node {
uint8_t *ni_rsn_ie; /* captured RSN ie */
uint8_t *ni_wme_ie; /* captured WME ie */
uint8_t *ni_ath_ie; /* captured Atheros ie */
#define IEEE80211_NONQOS_TID 16 /* index for non-QoS sta */
uint16_t ni_txseqs[17]; /* tx seq per-tid */
uint16_t ni_rxseqs[17]; /* rx seq previous per-tid*/
/* tx seq per-tid */
uint16_t ni_txseqs[IEEE80211_TID_SIZE];
/* rx seq previous per-tid*/
uint16_t ni_rxseqs[IEEE80211_TID_SIZE];
uint32_t ni_rxfragstamp; /* time stamp of last rx frag */
struct mbuf *ni_rxfrag[3]; /* rx frag reassembly */
struct ieee80211_rsnparms ni_rsn; /* RSN/WPA parameters */