2015-01-20 02:14:46

by Fred Chou

[permalink] [raw]
Subject: [PATCH v2] mac80211: correct header length calculation

From: Fred Chou <[email protected]>

HT Control field may also be present in management frames, as defined
in 8.2.4.1.10 of 802.11-2012. Account for this in calculation of header
length.

Signed-off-by: Fred Chou <[email protected]>
---
v2: insert management frame header length calculation after data

net/wireless/util.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 3535e8a..e2ae2d7 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -308,6 +308,12 @@ unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc)
goto out;
}

+ if (ieee80211_is_mgmt(fc)) {
+ if (ieee80211_has_order(fc))
+ hdrlen += IEEE80211_HT_CTL_LEN;
+ goto out;
+ }
+
if (ieee80211_is_ctl(fc)) {
/*
* ACK and CTS are 10 bytes, all others 16. To see how
--
1.9.1