diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-11 15:02:47 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-11 15:02:47 +0000 |
| commit | 1e5b7c17b031359a37ed7772b92cc98aaaeac727 (patch) | |
| tree | 5e2a88ef16da6f5c7c3b74ef607e5ba892252d5b /package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch | |
| parent | ee1e8c2f2df3b03ef89e5a8b31ae9e2f9907ade1 (diff) | |
| download | mtk-20170518-1e5b7c17b031359a37ed7772b92cc98aaaeac727.zip mtk-20170518-1e5b7c17b031359a37ed7772b92cc98aaaeac727.tar.gz mtk-20170518-1e5b7c17b031359a37ed7772b92cc98aaaeac727.tar.bz2 | |
mac80211: update to wireless-testing 2015-03-09
Based on patch by Bryan Forbes <bryan@reigndropsfall.net>
Also update mt76 to update for API changes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 44655
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, 0 insertions, 33 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 deleted file mode 100644 index 38e867f..0000000 --- a/package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch +++ /dev/null @@ -1,33 +0,0 @@ -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); - |