diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-11-19 22:08:07 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-11-28 17:01:50 +0300 |
| commit | 95943425c09616d22ba9bc185d70f8b815a77f9b (patch) | |
| tree | c07ac461ef254aaf424725c77c4892dfc4df1d99 /net/mac80211 | |
| parent | ea372c5452651f1b65ee817cd3409d63f0699b35 (diff) | |
| download | linux-95943425c09616d22ba9bc185d70f8b815a77f9b.tar.xz | |
mac80211: minstrel_ht: move aggregation check to .get_rate()
Preparation for adding a no-skb tx status path
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/rc80211_minstrel_ht.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 62ff7cfb2723..2641dc8aac13 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -782,9 +782,6 @@ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband, if (time_after(jiffies, mi->stats_update + (mp->update_interval / 2 * HZ) / 1000)) { update = true; minstrel_ht_update_stats(mp, mi); - if (!(info->flags & IEEE80211_TX_CTL_AMPDU) && - mi->max_prob_rate / MCS_GROUP_RATES != MINSTREL_CCK_GROUP) - minstrel_aggr_check(sta, skb); } if (update) @@ -1026,6 +1023,10 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta, if (!msp->is_ht) return mac80211_minstrel.get_rate(priv, sta, &msp->legacy, txrc); + if (!(info->flags & IEEE80211_TX_CTL_AMPDU) && + mi->max_prob_rate / MCS_GROUP_RATES != MINSTREL_CCK_GROUP) + minstrel_aggr_check(sta, txrc->skb); + info->flags |= mi->tx_flags; minstrel_ht_check_cck_shortpreamble(mp, mi, txrc->short_preamble); |