From: andy@warmcat.com
To: linux-wireless@vger.kernel.org
Cc: Andy Green <andy@warmcat.com>
Subject: [PATCH 1/1] iwl3945: provide frequency to radiotap monitor not channel index
Date: Sun, 08 Jul 2007 21:16:37 +0100 [thread overview]
Message-ID: <20070708201701.126477512@warmcat.com> (raw)
In-Reply-To: 20070708201636.804206271@warmcat.com
iwl3945 and presumably 4965 wrongly provide the channel index to the radiotap
header on Monitor mode. This results in tcpdump showing "6MHz" for example.
This patch arranges to send the frequency in MHz instead eg, 2437MHz
Signed-off-by: Andy Green <andy@warmcat.com>
---
drivers/net/wireless/mac80211/iwlwifi/base.c | 5 ++---
drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
Index: wireless-dev/drivers/net/wireless/mac80211/iwlwifi/base.c
===================================================================
--- wireless-dev.orig/drivers/net/wireless/mac80211/iwlwifi/base.c
+++ wireless-dev/drivers/net/wireless/mac80211/iwlwifi/base.c
@@ -2986,7 +2986,6 @@ void iwl_handle_data_packet_monitor(stru
* the information provided in the skb from the hardware */
s8 signal = stats->ssi;
s8 noise = 0;
- u16 channel = stats->channel;
int rate = stats->rate;
u64 tsf = stats->mactime;
@@ -3028,8 +3027,8 @@ void iwl_handle_data_packet_monitor(stru
iwl_rt->rt_dbmsignal = signal;
iwl_rt->rt_dbmnoise = noise;
- /* Convert the channel data and set the flags */
- iwl_rt->rt_channel = cpu_to_le16(channel);
+ /* Convert the channel frequency and set the flags */
+ iwl_rt->rt_channelMHz = cpu_to_le16(stats->freq);
if (!(phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK)) {
iwl_rt->rt_chbitmask =
cpu_to_le16((IEEE80211_CHAN_OFDM | IEEE80211_CHAN_5GHZ));
Index: wireless-dev/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h
===================================================================
--- wireless-dev.orig/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h
+++ wireless-dev/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h
@@ -103,7 +103,7 @@ struct iwl_rt_rx_hdr {
__le64 rt_tsf; /* TSF */
u8 rt_flags; /* radiotap packet flags */
u8 rt_rate; /* rate in 500kb/s */
- __le16 rt_channel; /* channel in mHz */
+ __le16 rt_channelMHz; /* channel in MHz */
__le16 rt_chbitmask; /* channel bitfield */
s8 rt_dbmsignal; /* signal in dBm, kluged to signed */
s8 rt_dbmnoise;
--
next prev parent reply other threads:[~2007-07-08 20:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-08 20:16 [PATCH 0/1] iwlwifi: Report MHz not channel index andy
2007-07-08 20:16 ` andy [this message]
2007-07-12 1:40 ` [PATCH 1/1] iwl3945: provide frequency to radiotap monitor " Zhu Yi
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=20070708201701.126477512@warmcat.com \
--to=andy@warmcat.com \
--cc=linux-wireless@vger.kernel.org \
/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).