Skip to content

Commit

Permalink
minstrel: update stats after processing status
Browse files Browse the repository at this point in the history
Instead of updating stats before sending a packet,
update them after processing the packet's status.
This makes minstrel in line with minstrel_ht.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Johannes Berg committed Dec 10, 2012
1 parent 8e3c1b7 commit 8acbcdd
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions net/mac80211/rc80211_minstrel.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband,
struct ieee80211_sta *sta, void *priv_sta,
struct sk_buff *skb)
{
struct minstrel_priv *mp = priv;
struct minstrel_sta_info *mi = priv_sta;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
struct ieee80211_tx_rate *ar = info->status.rates;
Expand Down Expand Up @@ -181,6 +182,10 @@ minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband,

if (mi->sample_deferred > 0)
mi->sample_deferred--;

if (time_after(jiffies, mi->stats_update +
(mp->update_interval * HZ) / 1000))
minstrel_update_stats(mp, mi);
}


Expand Down Expand Up @@ -235,10 +240,6 @@ minstrel_get_rate(void *priv, struct ieee80211_sta *sta,

mrr = mp->has_mrr && !txrc->rts && !txrc->bss_conf->use_cts_prot;

if (time_after(jiffies, mi->stats_update + (mp->update_interval *
HZ) / 1000))
minstrel_update_stats(mp, mi);

ndx = mi->max_tp_rate;

if (mrr)
Expand Down

0 comments on commit 8acbcdd

Please sign in to comment.