diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-24 16:46:38 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-24 16:46:38 +0200 |
commit | d9e78c77634c119098f37eba231fbb0e67e07103 (patch) | |
tree | f8db44589685402c0de3ed5d7c1a7256e0432086 | |
parent | f6c4c912bdfdfee7fa1531acaf009a92d92ab505 (diff) | |
parent | f6a90065d9e129d8a38a8687a36a516509aa5b88 (diff) | |
download | kernel-4.17.19-250.vanilla.knurd.1.fc28.tar.gz kernel-4.17.19-250.vanilla.knurd.1.fc28.tar.xz kernel-4.17.19-250.vanilla.knurd.1.fc28.zip |
merge originkernel-4.17.19-250.vanilla.knurd.1.fc28
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | ath10k-Update-the-phymode-along-with-bandwidth-change.patch | 76 | ||||
-rw-r--r-- | kernel.spec | 12 | ||||
-rw-r--r-- | sources | 2 |
4 files changed, 10 insertions, 82 deletions
diff --git a/.gitignore b/.gitignore index 93aa862ec..d8eaf86d1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ clog *.sign kernel-[234].*/ perf-man-*.tar.gz +kernel-tools/ +kernel-headers/ diff --git a/ath10k-Update-the-phymode-along-with-bandwidth-change.patch b/ath10k-Update-the-phymode-along-with-bandwidth-change.patch deleted file mode 100644 index 184c71272..000000000 --- a/ath10k-Update-the-phymode-along-with-bandwidth-change.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 24b6fe7240e15b6df53b0ace61a70f58e09f6fc6 Mon Sep 17 00:00:00 2001 -From: Ryan Hsu <ryanhsu@codeaurora.org> -Date: Fri, 8 Jun 2018 11:32:39 -0700 -Subject: [PATCH] ath10k: Update the phymode along with bandwidth change - request - -In the case of Station connects to AP with narrower bandwidth at beginning. -And later the AP changes the bandwidth to winder bandwidth, the AP will -beacon with wider bandwidth IE, eg VHT20->VHT40->VHT80 or VHT40->VHT80. - -Since the supported BANDWIDTH will be limited by the PHYMODE, so while -Station receives the bandwidth change request, it will also need to -reconfigure the PHYMODE setting to firmware instead of just configuring -the BANDWIDTH info, otherwise it'll trigger a firmware crash with -non-support bandwidth. - -The issue was observed in WLAN.RM.4.4.1-00051-QCARMSWP-1, QCA6174 with -below scenario. - -Reported-by: Rouven Czerwinski <rouven@czerwinskis.de> -Signed-off-by: Ryan Hsu <ryanhsu@codeaurora.org> -Signed-off-by: Jeremy Cline <jcline@redhat.com> ---- - drivers/net/wireless/ath/ath10k/mac.c | 16 ++++++++++++++-- - drivers/net/wireless/ath/ath10k/wmi.h | 1 + - 2 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c -index 2d7ef7460780..72d61ca3cb42 100644 ---- a/drivers/net/wireless/ath/ath10k/mac.c -+++ b/drivers/net/wireless/ath/ath10k/mac.c -@@ -5996,8 +5996,19 @@ static void ath10k_sta_rc_update_wk(struct work_struct *wk) - ath10k_mac_max_vht_nss(vht_mcs_mask))); - - if (changed & IEEE80211_RC_BW_CHANGED) { -- ath10k_dbg(ar, ATH10K_DBG_MAC, "mac update sta %pM peer bw %d\n", -- sta->addr, bw); -+ enum wmi_phy_mode mode; -+ -+ mode = chan_to_phymode(&def); -+ ath10k_dbg(ar, ATH10K_DBG_MAC, "mac update sta %pM peer bw %d phymode %d\n", -+ sta->addr, bw, mode); -+ -+ err = ath10k_wmi_peer_set_param(ar, arvif->vdev_id, sta->addr, -+ WMI_PEER_PHYMODE, mode); -+ if (err) { -+ ath10k_warn(ar, "failed to update STA %pM peer phymode %d: %d\n", -+ sta->addr, mode, err); -+ goto exit; -+ } - - err = ath10k_wmi_peer_set_param(ar, arvif->vdev_id, sta->addr, - WMI_PEER_CHAN_WIDTH, bw); -@@ -6038,6 +6049,7 @@ static void ath10k_sta_rc_update_wk(struct work_struct *wk) - sta->addr); - } - -+exit: - mutex_unlock(&ar->conf_mutex); - } - -diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h -index c7b30ed9015d..930a0e1b1163 100644 ---- a/drivers/net/wireless/ath/ath10k/wmi.h -+++ b/drivers/net/wireless/ath/ath10k/wmi.h -@@ -6010,6 +6010,7 @@ enum wmi_peer_param { - WMI_PEER_NSS = 0x5, - WMI_PEER_USE_4ADDR = 0x6, - WMI_PEER_DEBUG = 0xa, -+ WMI_PEER_PHYMODE = 0xd, - WMI_PEER_DUMMY_VAR = 0xff, /* dummy parameter for STA PS workaround */ - }; - --- -2.17.1 - diff --git a/kernel.spec b/kernel.spec index c6c5a8e15..861b133a9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -58,7 +58,7 @@ Summary: The Linux kernel %define stable_rc 0 # Do we have a -stable update to apply? -%define stable_update 18 +%define stable_update 19 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -652,10 +652,6 @@ Patch504: mailbox-ACPI-erroneous-error-message-when-parsing-ACPI.patch # https://www.spinics.net/lists/platform-driver-x86/msg15719.html Patch507: platform-x86-dell-laptop-Fix-keyboard-backlight-time.patch -# rhbz 1577106 -# http://lists.infradead.org/pipermail/ath10k/2018-June/011582.html -Patch508: ath10k-Update-the-phymode-along-with-bandwidth-change.patch - # rhbz 1568276 # In 4.18 Patch509: rtc-nvmem-don-t-return-an-error-when-not-enabled.patch @@ -1937,6 +1933,12 @@ fi # # %changelog +* Fri Aug 24 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.19-200 +- Linux v4.17.19 + +* Wed Aug 22 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.18-200 +- Linux v4.17.18 + * Mon Aug 20 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.17-200 - Linux v4.17.17 - Fix CVE-2018-15471 (rhbz 1610555 1618414) @@ -1,2 +1,2 @@ SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db -SHA512 (patch-4.17.18.xz) = d3f73cca96d5bd7a2b85d070248771e8ee7de911ca34e7698325c71d28c01207cd6266879e2cddb2e924f706cd7c8f294e3a9724e7095fbbc359d17828507253 +SHA512 (patch-4.17.19.xz) = 57fab939df862c3807d1ddd6461b19f85b3c0aba83203f327cf174f9d6e33c79e996362cabbb44014e03fe1eb77cf0232944927ae95aa1e51ef43b153d6343ab |