From: Felix Fietkau Date: Thu, 18 Feb 2016 18:49:18 +0000 (+0100) Subject: mac80211: minstrel_ht: set default tx aggregation timeout to 0 X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~4586 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8eecb5dc53b1dcfd0682402ad838ef4c248218f5;p=mirror_ubuntu-artful-kernel.git mac80211: minstrel_ht: set default tx aggregation timeout to 0 BugLink: http://bugs.launchpad.net/bugs/1558330 commit 7a36b930e6ed4702c866dc74a5ad07318a57c688 upstream. The value 5000 was put here with the addition of the timeout field to ieee80211_start_tx_ba_session. It was originally added in mac80211 to save resources for drivers like iwlwifi, which only supports a limited number of concurrent aggregation sessions. Since iwlwifi does not use minstrel_ht and other drivers don't need this, 0 is a better default - especially since there have been recent reports of aggregation setup related issues reproduced with ath9k. This should improve stability without causing any adverse effects. Acked-by: Avery Pennarun Signed-off-by: Felix Fietkau Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman Signed-off-by: Tim Gardner --- diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index f3e9ba4153bd..7e43598b28ae 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -691,7 +691,7 @@ minstrel_aggr_check(struct ieee80211_sta *pubsta, struct sk_buff *skb) if (likely(sta->ampdu_mlme.tid_tx[tid])) return; - ieee80211_start_tx_ba_session(pubsta, tid, 5000); + ieee80211_start_tx_ba_session(pubsta, tid, 0); } static void