diff options
| author | sam <sam@FreeBSD.org> | 2007-09-18 20:40:21 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2007-09-18 20:40:21 +0000 |
| commit | 20c40e534c1aa754aca8d819824e7844e8c28b41 (patch) | |
| tree | 0239e1f57f8810b8b2851f9df1ace1745e9c0e13 /sys/net80211 | |
| parent | 1f33ce6db98e41c07754378fdde8a0ecf551f9d1 (diff) | |
| download | FreeBSD-src-20c40e534c1aa754aca8d819824e7844e8c28b41.zip FreeBSD-src-20c40e534c1aa754aca8d819824e7844e8c28b41.tar.gz | |
o move IEEE80211_NONQOS_TID into a public location
o add IEEE80211_TID_SIZE and replace all the nake constants
Approved by: re (blanket wireless)
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/_ieee80211.h | 3 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_ioctl.h | 5 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_node.h | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/sys/net80211/_ieee80211.h b/sys/net80211/_ieee80211.h index 34a441d..0d79a2c 100644 --- a/sys/net80211/_ieee80211.h +++ b/sys/net80211/_ieee80211.h @@ -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. */ diff --git a/sys/net80211/ieee80211_ioctl.h b/sys/net80211/ieee80211_ioctl.h index 3221539..95ae8eb 100644 --- a/sys/net80211/ieee80211_ioctl.h +++ b/sys/net80211/ieee80211_ioctl.h @@ -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 */ diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index ccdf6a9..070890d 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -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 */ |
