From 9f5dba18e9a1a3716dd805702195521d32e385ca Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 11 Mar 2015 15:02:47 +0000 Subject: mac80211: update to wireless-testing 2015-03-09 Based on patch by Bryan Forbes Also update mt76 to update for API changes Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44655 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...nstrel_ht-move-aggregation-check-to-.get_.patch | 33 ---------------------- 1 file changed, 33 deletions(-) delete mode 100644 package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch (limited to 'package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch') 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 38e867ffac..0000000000 --- a/package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Felix Fietkau -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 ---- - ---- 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); - -- cgit v1.2.3