---

yaml
---
r: 342143
b: refs/heads/master
c: 8acbcdd
h: refs/heads/master
i:
  342141: c58e0d2
  342139: 44eda52
  342135: b8d58e9
  342127: 9755681
  342111: daff62b
  342079: 4847834
  342015: d27ce33
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e3c1b77435d93c0207d4701ca5b3e84d40c983d
+refs/heads/master: 8acbcddb5fb3a1dc081defe51b6ac42a7ab0b398

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)