From: Antonio Quartulli <antonio@meshcoding.com>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: b.a.t.m.a.n@lists.open-mesh.org, linux-wireless@vger.kernel.org,
devel@lists.open80211s.org,
Antonio Quartulli <antonio@open-mesh.com>
Subject: [PATCH 4/7] mac80211: export expected throughput in set_sta_info()
Date: Mon, 14 Apr 2014 16:03:22 +0200 [thread overview]
Message-ID: <1397484205-20905-4-git-send-email-antonio@meshcoding.com> (raw)
In-Reply-To: <1397484205-20905-1-git-send-email-antonio@meshcoding.com>
From: Antonio Quartulli <antonio@open-mesh.com>
If either the driver or the SW RC algorithm implements the
get_expected_throughput() API fill the related member in the
station_info object when dumping a station.
Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
---
net/mac80211/cfg.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index aa39381..31d1955 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -472,8 +472,12 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
{
struct ieee80211_sub_if_data *sdata = sta->sdata;
struct ieee80211_local *local = sdata->local;
+ struct rate_control_ref *ref = local->rate_ctrl;
+ struct ieee80211_supported_band *sband;
+ enum ieee80211_band band;
struct timespec uptime;
u64 packets = 0;
+ u32 thr = 0;
int i, ac;
sinfo->generation = sdata->local->sta_generation;
@@ -587,6 +591,23 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_ASSOCIATED);
if (test_sta_flag(sta, WLAN_STA_TDLS_PEER))
sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_TDLS_PEER);
+
+ /* check if the driver has a SW RC implementation */
+ if (ref && ref->ops->get_expected_throughput) {
+ band = ieee80211_get_sdata_band(sta->sdata);
+ sband = sta->local->hw.wiphy->bands[band];
+
+ thr = ref->ops->get_expected_throughput(ref->priv,
+ sta->rate_ctrl_priv,
+ sband);
+ } else {
+ thr = drv_get_expected_throughput(local, &sta->sta);
+ }
+
+ if (thr != 0) {
+ sinfo->filled |= STATION_INFO_EXPECTED_THROUGHPUT;
+ sinfo->expected_throughput = thr;
+ }
}
static const char ieee80211_gstrings_sta_stats[][ETH_GSTRING_LEN] = {
--
1.8.3.2
next prev parent reply other threads:[~2014-04-14 14:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-14 14:03 [PATCH 1/7] cfg80211: export expected throughput through get_station() Antonio Quartulli
2014-04-14 14:03 ` [PATCH 2/7] mac80211: add get_expected_throughput API Antonio Quartulli
2014-04-14 18:00 ` [B.A.T.M.A.N.] " Bastian Bittorf
2014-04-18 0:56 ` Yeoh Chun-Yeow
2014-04-18 6:19 ` Antonio Quartulli
2014-04-25 15:44 ` Johannes Berg
2014-05-14 21:09 ` Antonio Quartulli
2014-04-14 14:03 ` [PATCH 3/7] mac80211: add new RC API to retrieve expected throughput Antonio Quartulli
2014-04-25 15:45 ` Johannes Berg
2014-05-14 21:14 ` Antonio Quartulli
2014-04-14 14:03 ` Antonio Quartulli [this message]
2014-04-14 14:03 ` [PATCH 5/7] mac80211: minstrel - implement get_expected_throughput() API Antonio Quartulli
2014-04-25 15:46 ` Johannes Berg
2014-04-25 15:47 ` Antonio Quartulli
2014-04-14 14:03 ` [PATCH 6/7] mac80211: minstrel_ht " Antonio Quartulli
2014-04-14 14:03 ` [PATCH 7/7] cfg80211: implement cfg80211_get_station cfg80211 API Antonio Quartulli
2014-04-25 15:46 ` Johannes Berg
2014-05-14 21:15 ` Antonio Quartulli
2014-04-25 15:44 ` [PATCH 1/7] cfg80211: export expected throughput through get_station() Johannes Berg
2014-05-14 21:27 ` Antonio Quartulli
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=1397484205-20905-4-git-send-email-antonio@meshcoding.com \
--to=antonio@meshcoding.com \
--cc=antonio@open-mesh.com \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=devel@lists.open80211s.org \
--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).