mac80211: mesh: use average bitrate for link metric calculation
Use bitrate moving average to smooth out link metric and stablize path selection. Signed-off-by: Julan Hsu <julanhsu@google.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
@@ -300,6 +300,7 @@ void ieee80211s_update_metric(struct ieee80211_local *local,
|
||||
{
|
||||
struct ieee80211_tx_info *txinfo = st->info;
|
||||
int failed;
|
||||
struct rate_info rinfo;
|
||||
|
||||
failed = !(txinfo->flags & IEEE80211_TX_STAT_ACK);
|
||||
|
||||
@@ -310,12 +311,15 @@ void ieee80211s_update_metric(struct ieee80211_local *local,
|
||||
if (ewma_mesh_fail_avg_read(&sta->mesh->fail_avg) >
|
||||
LINK_FAIL_THRESH)
|
||||
mesh_plink_broken(sta);
|
||||
|
||||
sta_set_rate_info_tx(sta, &sta->tx_stats.last_rate, &rinfo);
|
||||
ewma_mesh_tx_rate_avg_add(&sta->mesh->tx_rate_avg,
|
||||
cfg80211_calculate_bitrate(&rinfo));
|
||||
}
|
||||
|
||||
static u32 airtime_link_metric_get(struct ieee80211_local *local,
|
||||
struct sta_info *sta)
|
||||
{
|
||||
struct rate_info rinfo;
|
||||
/* This should be adjusted for each device */
|
||||
int device_constant = 1 << ARITH_SHIFT;
|
||||
int test_frame_len = TEST_FRAME_LEN << ARITH_SHIFT;
|
||||
@@ -339,8 +343,7 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local,
|
||||
if (fail_avg > LINK_FAIL_THRESH)
|
||||
return MAX_METRIC;
|
||||
|
||||
sta_set_rate_info_tx(sta, &sta->tx_stats.last_rate, &rinfo);
|
||||
rate = cfg80211_calculate_bitrate(&rinfo);
|
||||
rate = ewma_mesh_tx_rate_avg_read(&sta->mesh->tx_rate_avg);
|
||||
if (WARN_ON(!rate))
|
||||
return MAX_METRIC;
|
||||
|
||||
|
Reference in New Issue
Block a user