From d093846b1e2441597b19ca9899246df415204b8b Mon Sep 17 00:00:00 2001
From: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
Date: Mon, 7 Feb 2011 10:10:04 +0530
Subject: [PATCH] --- yaml --- r: 237055 b: refs/heads/master c:
 38f37be20941a6f1931ca4c051e638f947415eab h: refs/heads/master i:   237053:
 2f1e52daeb14af26f019efe3cb9a1366690fac53   237051:
 169609eb37510f1f8abdc63b0d77ab2f9c2e499a   237047:
 b296d800f4904363515d15851b9faf893b4188ab   237039:
 7a8f39ebce2d8d511bb8f28477864c64ac27dd7f   237023:
 b49f174c1090b3ca041fb064f5aeceffe0f7c0ef   236991:
 28d2a48ceafeed52e818da59d8f589e3360263c8   236927:
 9c493ee634c3c97b1d640bb6a0c460ae4ac092cf   236799:
 21adee5a295830d43ea85dbbe6e3dc11c08115db   236543:
 a1a39cb76461a6521435b3bdf047684a93c29226 v: v3

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

diff --git a/[refs] b/[refs]
index ab15882712b8..b380bfcab2df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f3123366f78cf34ce7caab923e2b3c4fe9e16c2
+refs/heads/master: 38f37be20941a6f1931ca4c051e638f947415eab
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 50c2c881249d..045b2fe4a414 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -142,11 +142,8 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
 	/* IEEE80211_RADIOTAP_RATE */
 	if (status->flag & RX_FLAG_HT) {
 		/*
-		 * TODO: add following information into radiotap header once
-		 * suitable fields are defined for it:
-		 * - MCS index (status->rate_idx)
-		 * - HT40 (status->flag & RX_FLAG_40MHZ)
-		 * - short-GI (status->flag & RX_FLAG_SHORT_GI)
+		 * MCS information is a separate field in radiotap,
+		 * added below.
 		 */
 		*pos = 0;
 	} else {