34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
|
From: Felix Fietkau <nbd@openwrt.org>
|
||
|
|
Date: Sat, 15 Nov 2014 22:16:36 +0100
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- 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
|
||
|
|
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
|
||
|
|
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);
|
||
|
|
|