From 22002c19af95699e6bb3595fac53e3d52323c4dd Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Mon, 15 Dec 2008 10:37:50 +0200
Subject: [PATCH] --- yaml --- r: 122805 b: refs/heads/master c:
 8d6f658e211a3c6ff808f7fc6ebb30239457eabc h: refs/heads/master i:   122803:
 343dc6de1d789071fdeb7d9785da2c8aa1223ff3 v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/rx.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bd2e699884fd..83e7ebaddf7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d85882273367e98aecb9ff11a9d76515a6d37131
+refs/heads/master: 8d6f658e211a3c6ff808f7fc6ebb30239457eabc
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index b729c005a2b3..7175ae80c36a 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/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 */