Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-12 22:18:26 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-12 22:21:34 +0100
commitc13ef789add6260dddad3697add87341bf0d45a3 (patch)
treec2dfdfead8da5aeaf5339156833cbb081be4dbdd
parent7fb88a96a9cc7079046c4655699f063f7c0fc4fb (diff)
ath9k: dynack: check da->enabled first in sampling routines
-rw-r--r--patches.kernel.org/4.20.8-345-ath9k-dynack-check-da-enabled-first-in-samplin.patch47
-rw-r--r--series.conf1
2 files changed, 48 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.8-345-ath9k-dynack-check-da-enabled-first-in-samplin.patch b/patches.kernel.org/4.20.8-345-ath9k-dynack-check-da-enabled-first-in-samplin.patch
new file mode 100644
index 0000000000..e051e1c628
--- /dev/null
+++ b/patches.kernel.org/4.20.8-345-ath9k-dynack-check-da-enabled-first-in-samplin.patch
@@ -0,0 +1,47 @@
+From: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
+Date: Fri, 2 Nov 2018 21:49:57 +0100
+Subject: [PATCH] ath9k: dynack: check da->enabled first in sampling routines
+References: bnc#1012628
+Patch-mainline: 4.20.8
+Git-commit: 9d3d65a91f027b8a9af5e63752d9b78cb10eb92d
+
+commit 9d3d65a91f027b8a9af5e63752d9b78cb10eb92d upstream.
+
+Check da->enabled flag first in ath_dynack_sample_tx_ts and
+ath_dynack_sample_ack_ts routines in order to avoid useless
+processing
+
+Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
+Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/net/wireless/ath/ath9k/dynack.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/wireless/ath/ath9k/dynack.c b/drivers/net/wireless/ath/ath9k/dynack.c
+index d2a7531ceafe..6e236a485431 100644
+--- a/drivers/net/wireless/ath/ath9k/dynack.c
++++ b/drivers/net/wireless/ath/ath9k/dynack.c
+@@ -184,7 +184,7 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,
+ struct ath_common *common = ath9k_hw_common(ah);
+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+
+- if ((info->flags & IEEE80211_TX_CTL_NO_ACK) || !da->enabled)
++ if (!da->enabled || (info->flags & IEEE80211_TX_CTL_NO_ACK))
+ return;
+
+ spin_lock_bh(&da->qlock);
+@@ -266,7 +266,7 @@ void ath_dynack_sample_ack_ts(struct ath_hw *ah, struct sk_buff *skb,
+ struct ath_common *common = ath9k_hw_common(ah);
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+
+- if (!ath_dynack_bssidmask(ah, hdr->addr1) || !da->enabled)
++ if (!da->enabled || !ath_dynack_bssidmask(ah, hdr->addr1))
+ return;
+
+ spin_lock_bh(&da->qlock);
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 462d1adabf..5bf24bd80e 100644
--- a/series.conf
+++ b/series.conf
@@ -1081,6 +1081,7 @@
patches.kernel.org/4.20.8-342-cacheinfo-Keep-the-old-value-if-of_property_re.patch
patches.kernel.org/4.20.8-343-nfsd-Fix-error-return-values-for-nfsd4_clone_f.patch
patches.kernel.org/4.20.8-344-ath9k-dynack-make-ewma-estimation-faster.patch
+ patches.kernel.org/4.20.8-345-ath9k-dynack-check-da-enabled-first-in-samplin.patch
########################################################
# Build fixes that apply to the vanilla kernel too.