From: Greg Kroah-Hartman Date: Mon, 11 Feb 2019 19:10:34 +0000 (+0100) Subject: drop an ath9k patch from 3.18 and 4.4 X-Git-Tag: v4.9.156~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c9e90613d40aecfe11d4c642f41f35c68726949;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index ec9956f76e1..00000000000 --- 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 -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 -Tested-by: Koen Vandeputte -Signed-off-by: Lorenzo Bianconi -Signed-off-by: Kalle Valo -Signed-off-by: Sasha Levin ---- - 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 64663c2bccd..18e198d6cd2 100644 --- 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 index 7dfec111894..00000000000 --- 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 -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 -Tested-by: Koen Vandeputte -Signed-off-by: Lorenzo Bianconi -Signed-off-by: Kalle Valo -Signed-off-by: Sasha Levin ---- - 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 a3f549be18e..25630be5b5b 100644 --- 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