mac80211: (selectively) add HT details in radiotap

Add a flag for the HT format (mixed vs. greenfield)
to allow drivers to report that on receive. Not all
drivers will do that though, so allow drivers to set
which radiotap MCS details they report.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index d5ac02fe37ff..489093b08a4a 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -204,14 +204,14 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
 
         if (status->flag & RX_FLAG_HT) {
                 rthdr->it_present |= cpu_to_le32(1 << IEEE80211_RADIOTAP_MCS);
-                *pos++ = IEEE80211_RADIOTAP_MCS_HAVE_MCS |
-                         IEEE80211_RADIOTAP_MCS_HAVE_GI |
-                         IEEE80211_RADIOTAP_MCS_HAVE_BW;
+                *pos++ = local->hw.radiotap_mcs_details;
                 *pos = 0;
                 if (status->flag & RX_FLAG_SHORT_GI)
                         *pos |= IEEE80211_RADIOTAP_MCS_SGI;
                 if (status->flag & RX_FLAG_40MHZ)
                         *pos |= IEEE80211_RADIOTAP_MCS_BW_40;
+                if (status->flag & RX_FLAG_HT_GF)
+                        *pos |= IEEE80211_RADIOTAP_MCS_FMT_GF;
                 pos++;
                 *pos++ = status->rate_idx;
         }