From: Maxime Bizon Date: Thu, 18 Nov 2021 11:58:24 +0000 (+0100) Subject: mac80211: fix TCP performance on mesh interface X-Git-Tag: v5.16-rc6~24^2~19^2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48c06708e63e71b4395e4159797366aa03be10ff;p=thirdparty%2Fkernel%2Flinux.git mac80211: fix TCP performance on mesh interface sta is NULL for mesh point (resolved later), so sk pacing parameters were not applied. Signed-off-by: Maxime Bizon Link: https://lore.kernel.org/r/66f51659416ac35d6b11a313bd3ffe8b8a43dd55.camel@freebox.fr Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 278945e3e08ac..51ec5f9bc2e09 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -4191,11 +4191,11 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, ieee80211_aggr_check(sdata, sta, skb); + sk_pacing_shift_update(skb->sk, sdata->local->hw.tx_sk_pacing_shift); + if (sta) { struct ieee80211_fast_tx *fast_tx; - sk_pacing_shift_update(skb->sk, sdata->local->hw.tx_sk_pacing_shift); - fast_tx = rcu_dereference(sta->fast_tx); if (fast_tx &&