linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: [RFC 2/2] iwlwifi: give HT format to mac80211/radiotap
Date: Thu, 10 May 2012 09:09:11 +0200	[thread overview]
Message-ID: <20120510070930.930461401@sipsolutions.net> (raw)
In-Reply-To: 20120510070909.253886400@sipsolutions.net

From: Johannes Berg <johannes.berg@intel.com>

We know whether we received a frame in GF format
or not, add it to the radiotap information.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/iwlwifi/iwl-agn-rx.c   |    2 ++
 drivers/net/wireless/iwlwifi/iwl-mac80211.c |    2 ++
 2 files changed, 4 insertions(+)

--- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c	2012-05-10 08:54:26.000000000 +0200
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c	2012-05-10 09:04:42.000000000 +0200
@@ -1007,6 +1007,8 @@ static int iwlagn_rx_reply_rx(struct iwl
 		rx_status.flag |= RX_FLAG_40MHZ;
 	if (rate_n_flags & RATE_MCS_SGI_MSK)
 		rx_status.flag |= RX_FLAG_SHORT_GI;
+	if (rate_n_flags & RATE_MCS_GF_MSK)
+		rx_status.flag |= RX_FLAG_HT_GF;
 
 	iwlagn_pass_packet_to_mac80211(priv, header, len, ampdu_status,
 				    rxb, &rx_status);
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c	2012-05-10 08:53:23.000000000 +0200
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c	2012-05-10 09:06:16.000000000 +0200
@@ -38,6 +38,7 @@
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
 
+#include <net/ieee80211_radiotap.h>
 #include <net/mac80211.h>
 
 #include <asm/div64.h>
@@ -154,6 +155,7 @@ int iwlagn_mac_setup_register(struct iwl
 		    IEEE80211_HW_SCAN_WHILE_IDLE;
 
 	hw->offchannel_tx_hw_queue = IWL_AUX_QUEUE;
+	hw->radiotap_mcs_details |= IEEE80211_RADIOTAP_MCS_HAVE_FMT;
 
 	/*
 	 * Including the following line will crash some AP's.  This



      parent reply	other threads:[~2012-05-10  7:10 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-10  7:09 [PATCH 0/2] add HT format to radiotap Johannes Berg
2012-05-10  7:09 ` [PATCH 1/2] mac80211: (selectively) add HT details in radiotap Johannes Berg
2012-05-10  7:09 ` Johannes Berg [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120510070930.930461401@sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).