drop an ath9k patch from 3.18 and 4.4

diff --git a/queue-3.18/ath9k-dynack-use-authentication-messages-for-late-ac.patch b/queue-3.18/ath9k-dynack-use-authentication-messages-for-late-ac.patch
deleted file mode 100644 (file)
index ec9956f..0000000
--- a/queue-3.18/ath9k-dynack-use-authentication-messages-for-late-ac.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 93fac85092bae769a62f1576f2bd78db9c533728 Mon Sep 17 00:00:00 2001
-From: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
-Date: Fri, 2 Nov 2018 21:49:55 +0100
-Subject: ath9k: dynack: use authentication messages for 'late' ack
-
-[ Upstream commit 3831a2a0010c72e3956020cbf1057a1701a2e469 ]
-
-In order to properly support dynack in ad-hoc mode running
-wpa_supplicant, take into account authentication frames for
-'late ack' detection. This patch has been tested on devices
-mounted on offshore high-voltage stations connected through
-~24Km link
-
-Reported-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
-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: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/ath/ath9k/dynack.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/ath/ath9k/dynack.c b/drivers/net/wireless/ath/ath9k/dynack.c
-index 22b3cc4c27cd..64965bf9034d 100644
---- a/drivers/net/wireless/ath/ath9k/dynack.c
-+++ b/drivers/net/wireless/ath/ath9k/dynack.c
-@@ -187,7 +187,8 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,
-       /* late ACK */
-       if (ts->ts_status & ATH9K_TXERR_XRETRY) {
-               if (ieee80211_is_assoc_req(hdr->frame_control) ||
--                  ieee80211_is_assoc_resp(hdr->frame_control)) {
-+                  ieee80211_is_assoc_resp(hdr->frame_control) ||
-+                  ieee80211_is_auth(hdr->frame_control)) {
-                       ath_dbg(common, DYNACK, "late ack\n");
-                       ath9k_hw_setslottime(ah, (LATEACK_TO - 3) / 2);
-                       ath9k_hw_set_ack_timeout(ah, LATEACK_TO);
--- 
-2.19.1
-

diff --git a/queue-3.18/series b/queue-3.18/series
index 64663c2bccd5fb377ab143a5dadcaca24f97b82b..18e198d6cd2e741765f562ab72250669d9946c3f 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -1,5 +1,4 @@
 staging-iio-adc-ad7280a-handle-error-from-__ad7280_r.patch
-ath9k-dynack-use-authentication-messages-for-late-ac.patch
 arm-8808-1-kexec-offline-panic_smp_self_stop-cpu.patch
 dlm-don-t-swamp-the-cpu-with-callbacks-queued-during.patch
 x86-pci-fix-broadcom-cnb20le-unintended-sign-extensi.patch

diff --git a/queue-4.4/ath9k-dynack-use-authentication-messages-for-late-ac.patch b/queue-4.4/ath9k-dynack-use-authentication-messages-for-late-ac.patch
deleted file mode 100644 (file)
index 7dfec11..0000000
--- a/queue-4.4/ath9k-dynack-use-authentication-messages-for-late-ac.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f28717557f57d927294cff93fb12272896c01c67 Mon Sep 17 00:00:00 2001
-From: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
-Date: Fri, 2 Nov 2018 21:49:55 +0100
-Subject: ath9k: dynack: use authentication messages for 'late' ack
-
-[ Upstream commit 3831a2a0010c72e3956020cbf1057a1701a2e469 ]
-
-In order to properly support dynack in ad-hoc mode running
-wpa_supplicant, take into account authentication frames for
-'late ack' detection. This patch has been tested on devices
-mounted on offshore high-voltage stations connected through
-~24Km link
-
-Reported-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
-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: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/ath/ath9k/dynack.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/ath/ath9k/dynack.c b/drivers/net/wireless/ath/ath9k/dynack.c
-index 22b3cc4c27cd..64965bf9034d 100644
---- a/drivers/net/wireless/ath/ath9k/dynack.c
-+++ b/drivers/net/wireless/ath/ath9k/dynack.c
-@@ -187,7 +187,8 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,
-       /* late ACK */
-       if (ts->ts_status & ATH9K_TXERR_XRETRY) {
-               if (ieee80211_is_assoc_req(hdr->frame_control) ||
--                  ieee80211_is_assoc_resp(hdr->frame_control)) {
-+                  ieee80211_is_assoc_resp(hdr->frame_control) ||
-+                  ieee80211_is_auth(hdr->frame_control)) {
-                       ath_dbg(common, DYNACK, "late ack\n");
-                       ath9k_hw_setslottime(ah, (LATEACK_TO - 3) / 2);
-                       ath9k_hw_set_ack_timeout(ah, LATEACK_TO);
--- 
-2.19.1
-

diff --git a/queue-4.4/series b/queue-4.4/series
index a3f549be18e7bb4068d8ef3c31106425b38158ea..25630be5b5b9928c531344054882a563019f9f07 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1,7 +1,6 @@
 drm-bufs-fix-spectre-v1-vulnerability.patch
 staging-iio-adc-ad7280a-handle-error-from-__ad7280_r.patch
 asoc-intel-mrfld-fix-uninitialized-variable-access.patch
-ath9k-dynack-use-authentication-messages-for-late-ac.patch
 scsi-lpfc-correct-lcb-rjt-handling.patch
 arm-8808-1-kexec-offline-panic_smp_self_stop-cpu.patch
 dlm-don-t-swamp-the-cpu-with-callbacks-queued-during.patch