diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-11-18 22:20:45 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-11-18 22:20:45 +0000 |
| commit | 792d02f2b6e5c7a26b0d56641b36a80d9b6db5f5 (patch) | |
| tree | 16835b93a0c5cce62e1d712a31083aba1f56d300 /package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch | |
| parent | aa17299b5a35d8cd6f5a7e9738a02bcf2f84ca65 (diff) | |
| download | master-187ad058-792d02f2b6e5c7a26b0d56641b36a80d9b6db5f5.tar.gz master-187ad058-792d02f2b6e5c7a26b0d56641b36a80d9b6db5f5.tar.bz2 master-187ad058-792d02f2b6e5c7a26b0d56641b36a80d9b6db5f5.zip | |
mac80211: add support for reporting tx status without attached skb
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43297 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch b/package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch new file mode 100644 index 0000000000..38e867ffac --- /dev/null +++ b/package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch @@ -0,0 +1,33 @@ +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); + |