linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: saravanad@posedge.com
To: <johannes@sipsolutions.net>
Cc: <linux-wireless@vger.kernel.org>
Subject: [RFC] mac80211: re-organize the rx rate calculation logic
Date: Mon, 26 Nov 2012 04:17:40 -0800	[thread overview]
Message-ID: <d4c0566bd33c1afdcc0f7b820024d19f@posedge.com> (raw)

Mac80211: currently the logic to calculate the rx rate is accessible 
only in the cfg.c as the rate_idx_to_bitrate() is static function.
The rx rate calculation might be needed by other files(modules) of 
mac80211(possibly debugfs). So grouping the rx rate calculation logic to
a separate function which can be accessed from other files. This change 
will make the rx rate calculation implementation similar to tx rate.

Signed-off-by: Saravana <saravanad@posedge.com>
---
The diff file is generated from wireless-testing git tree.
  net/mac80211/cfg.c      |   21 +++++++++++++--------
  net/mac80211/sta_info.h |    2 ++
  2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 6733b374..0999547 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -396,6 +396,18 @@ void sta_set_rate_info_tx(struct sta_info *sta,
  	rate_idx_to_bitrate(rinfo, sta, rate->idx);
  }

+void sta_set_rate_info_rx(struct sta_info *sta, struct rate_info 
*rinfo)
+{
+	rinfo->flags = 0;
+	if (sta->last_rx_rate_flag & RX_FLAG_HT)
+		rinfo->flags |= RATE_INFO_FLAGS_MCS;
+	if (sta->last_rx_rate_flag & RX_FLAG_40MHZ)
+		rinfo->flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
+	if (sta->last_rx_rate_flag & RX_FLAG_SHORT_GI)
+		rinfo->flags |= RATE_INFO_FLAGS_SHORT_GI;
+	rate_idx_to_bitrate(rinfo, sta, sta->last_rx_rate_idx);
+
+}
  static void sta_set_sinfo(struct sta_info *sta, struct station_info 
*sinfo)
  {
  	struct ieee80211_sub_if_data *sdata = sta->sdata;
@@ -443,14 +455,7 @@ static void sta_set_sinfo(struct sta_info *sta, 
struct station_info *sinfo)

  	sta_set_rate_info_tx(sta, &sta->last_tx_rate, &sinfo->txrate);

-	sinfo->rxrate.flags = 0;
-	if (sta->last_rx_rate_flag & RX_FLAG_HT)
-		sinfo->rxrate.flags |= RATE_INFO_FLAGS_MCS;
-	if (sta->last_rx_rate_flag & RX_FLAG_40MHZ)
-		sinfo->rxrate.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
-	if (sta->last_rx_rate_flag & RX_FLAG_SHORT_GI)
-		sinfo->rxrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
-	rate_idx_to_bitrate(&sinfo->rxrate, sta, sta->last_rx_rate_idx);
+	sta_set_rate_info_rx(sta, &sinfo->rxrate);

  	if (ieee80211_vif_is_mesh(&sdata->vif)) {
  #ifdef CONFIG_MAC80211_MESH
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 776f3d0..122d853 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -550,6 +550,8 @@ int sta_info_flush(struct ieee80211_local *local,
  void sta_set_rate_info_tx(struct sta_info *sta,
  			  const struct ieee80211_tx_rate *rate,
  			  struct rate_info *rinfo);
+void sta_set_rate_info_rx(struct sta_info *sta,
+			struct rate_info *rinfo);
  void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,
  			  unsigned long exp_time);


             reply	other threads:[~2012-11-26 12:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-26 12:17 saravanad [this message]
2012-11-26 15:08 ` [RFC] mac80211: re-organize the rx rate calculation logic Johannes Berg
2012-11-27  6:20   ` Saravana
2012-11-27  7:42     ` Saravana

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=d4c0566bd33c1afdcc0f7b820024d19f@posedge.com \
    --to=saravanad@posedge.com \
    --cc=johannes@sipsolutions.net \
    --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).