aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2008-12-15 10:37:50 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-12-19 15:23:22 -0500
commit8d6f658e211a3c6ff808f7fc6ebb30239457eabc (patch)
treea45fe7ba263a6f943bc4a4d2043496ad4a20f684 /net/mac80211
parentd85882273367e98aecb9ff11a9d76515a6d37131 (diff)
downloadkernel_samsung_smdk4412-8d6f658e211a3c6ff808f7fc6ebb30239457eabc.zip
kernel_samsung_smdk4412-8d6f658e211a3c6ff808f7fc6ebb30239457eabc.tar.gz
kernel_samsung_smdk4412-8d6f658e211a3c6ff808f7fc6ebb30239457eabc.tar.bz2
mac80211: Remove radiotap rate-present flag for HT
Since we do not currently report HT rates (MCS index) in radiotap header for HT rates, we should not claim the rate is present. The rate octet itself is used as padding in this case, so only the it_present flag needs to be removed in case of HT rates. Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rx.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index b729c00..7175ae8 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -123,7 +123,6 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
/* radiotap header, set always present flags */
rthdr->it_present =
cpu_to_le32((1 << IEEE80211_RADIOTAP_FLAGS) |
- (1 << IEEE80211_RADIOTAP_RATE) |
(1 << IEEE80211_RADIOTAP_CHANNEL) |
(1 << IEEE80211_RADIOTAP_ANTENNA) |
(1 << IEEE80211_RADIOTAP_RX_FLAGS));
@@ -158,8 +157,10 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
* - short-GI (status->flag & RX_FLAG_SHORT_GI)
*/
*pos = 0;
- } else
+ } else {
+ rthdr->it_present |= (1 << IEEE80211_RADIOTAP_RATE);
*pos = rate->bitrate / 5;
+ }
pos++;
/* IEEE80211_RADIOTAP_CHANNEL */