aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAndriy Tkachuk <andrit@ukr.net>2010-01-20 06:55:06 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-01-22 16:11:27 -0500
commitd0dd2de0d055f0ffb1e2ecdc21380de9d12a85e2 (patch)
treecb3d3e77e62c22032f0fac4c58e8f304f08f5061 /include/linux
parentef15aac6073b27fd4f70007784d2d52ed394bf43 (diff)
mac80211: Account HT Control field in Data frame hdrlen according to 802.11n-2009
ieee80211_hdrlen() should account account new HT Control field in 802.11 data frame header introduced by IEEE 802.11n standard. According to 802.11n-2009 HT Control field is present in data frames when both of following are met: 1. It is QoS data frame. 2. Order bit is set in Frame Control field. The change might be totally compatible with legacy non-11n aware frames, because 802.11-2007 standard states that "all QoS STAs set this subfield to 0". Signed-off-by: Andriy V. Tkachuk <andrit@ukr.net> Acked-by : Benoit Papillault <benoit.papillault@free.fr> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ieee80211.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 842701906ae9..19984958ab7b 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -138,6 +138,8 @@
138#define IEEE80211_WMM_IE_STA_QOSINFO_SP_MASK 0x03 138#define IEEE80211_WMM_IE_STA_QOSINFO_SP_MASK 0x03
139#define IEEE80211_WMM_IE_STA_QOSINFO_SP_SHIFT 5 139#define IEEE80211_WMM_IE_STA_QOSINFO_SP_SHIFT 5
140 140
141#define IEEE80211_HT_CTL_LEN 4
142
141struct ieee80211_hdr { 143struct ieee80211_hdr {
142 __le16 frame_control; 144 __le16 frame_control;
143 __le16 duration_id; 145 __le16 duration_id;