diff options
| author | Maxim Altshul <maxim.altshul@ti.com> | 2016-07-11 17:15:24 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2016-08-11 16:51:40 +0200 |
| commit | 3b17fbf87d5dadf123d328ab072334da285748c1 (patch) | |
| tree | 70e7daf6b65e3ed27b4fab41725aca05717d84a5 /net/mac80211/sta_info.c | |
| parent | 6cdaf03f8c23fcbfe7d4fa6876e114193bb6b632 (diff) | |
| download | linux-3b17fbf87d5dadf123d328ab072334da285748c1.tar.gz linux-3b17fbf87d5dadf123d328ab072334da285748c1.tar.bz2 linux-3b17fbf87d5dadf123d328ab072334da285748c1.zip | |
mac80211: mesh: Add support for HW RC implementation
Mesh HWMP module will be able to rely on the HW
RC algorithm if it exists, for path metric calculations.
This allows the metric calculation mechanism to calculate
a correct metric, based on PER and last TX rate both via
HW RC algorithm if it exists or via parameters collected
by the SW.
Signed-off-by: Maxim Altshul <maxim.altshul@ti.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 76b737dcc36f..d1cba819e19a 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -2279,16 +2279,31 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) if (test_sta_flag(sta, WLAN_STA_TDLS_PEER)) sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_TDLS_PEER); + thr = sta_get_expected_throughput(sta); + + if (thr != 0) { + sinfo->filled |= BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT); + sinfo->expected_throughput = thr; + } +} + +u32 sta_get_expected_throughput(struct sta_info *sta) +{ + struct ieee80211_sub_if_data *sdata = sta->sdata; + struct ieee80211_local *local = sdata->local; + struct rate_control_ref *ref = NULL; + u32 thr = 0; + + if (test_sta_flag(sta, WLAN_STA_RATE_CONTROL)) + ref = local->rate_ctrl; + /* check if the driver has a SW RC implementation */ if (ref && ref->ops->get_expected_throughput) thr = ref->ops->get_expected_throughput(sta->rate_ctrl_priv); else thr = drv_get_expected_throughput(local, &sta->sta); - if (thr != 0) { - sinfo->filled |= BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT); - sinfo->expected_throughput = thr; - } + return thr; } unsigned long ieee80211_sta_last_active(struct sta_info *sta) |