From a0e7170809a979d5bbb4ba832c87cfdf5c058a6c Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 15 Nov 2012 18:27:56 +0100 Subject: [PATCH] --- yaml --- r: 342143 b: refs/heads/master c: 8acbcddb5fb3a1dc081defe51b6ac42a7ab0b398 h: refs/heads/master i: 342141: c58e0d29c8403bf7e60f630cacddf083d7d828d6 342139: 44eda52f39680a85477187ddae5a402ca2e9163f 342135: b8d58e93d9ef399f5d69d20cc6b4552c518a6e7a 342127: 9755681401e4c900328a9e86f5c5b4ee3d48bbb3 342111: daff62b286616bd5882e442e70ff5e6082181a64 342079: 4847834d388f1a5c016b704de754cd56e39fe070 342015: d27ce33b6962658a80a9161d58b87cc34fcec5e5 v: v3 --- [refs] | 2 +- trunk/net/mac80211/rc80211_minstrel.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1ef167e9b5b9..ec1f5a87c183 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e3c1b77435d93c0207d4701ca5b3e84d40c983d +refs/heads/master: 8acbcddb5fb3a1dc081defe51b6ac42a7ab0b398 diff --git a/trunk/net/mac80211/rc80211_minstrel.c b/trunk/net/mac80211/rc80211_minstrel.c index 79633ae06fd6..8c5acdc06226 100644 --- a/trunk/net/mac80211/rc80211_minstrel.c +++ b/trunk/net/mac80211/rc80211_minstrel.c @@ -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; @@ -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); } @@ -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)