---

yaml --- r: 183873 b: refs/heads/master c: d0dd2de h: refs/heads/master i: 183871: 8794050 v: v3
git-mirror · Jan 22, 2010 · 9aaf1a3 · 9aaf1a3
1 parent 1a55f63
commit 9aaf1a3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef15aac6073b27fd4f70007784d2d52ed394bf43
+refs/heads/master: d0dd2de0d055f0ffb1e2ecdc21380de9d12a85e2
diff --git a/trunk/include/linux/ieee80211.h b/trunk/include/linux/ieee80211.h
@@ -138,6 +138,8 @@
 #define IEEE80211_WMM_IE_STA_QOSINFO_SP_MASK	0x03
 #define IEEE80211_WMM_IE_STA_QOSINFO_SP_SHIFT	5
 
+#define IEEE80211_HT_CTL_LEN		4
+
 struct ieee80211_hdr {
 	__le16 frame_control;
 	__le16 duration_id;

diff --git a/trunk/net/wireless/util.c b/trunk/net/wireless/util.c
@@ -227,8 +227,11 @@ unsigned int ieee80211_hdrlen(__le16 fc)
 	if (ieee80211_is_data(fc)) {
 		if (ieee80211_has_a4(fc))
 			hdrlen = 30;
-		if (ieee80211_is_data_qos(fc))
+		if (ieee80211_is_data_qos(fc)) {
 			hdrlen += IEEE80211_QOS_CTL_LEN;
+			if (ieee80211_has_order(fc))
+				hdrlen += IEEE80211_HT_CTL_LEN;
+		}
 		goto out;
 	}