linux5.4: update to 5.4.16.
This commit is contained in:
parent
cae5f53732
commit
7a91d6d370
2 changed files with 2 additions and 50 deletions
|
@ -1,48 +0,0 @@
|
||||||
From 78fe4d666ff244609c7d02bea07a22ce87e56326 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mehmet Akif Tasova <makiftasova@gmail.com>
|
|
||||||
Date: Mon, 30 Dec 2019 15:48:16 +0200
|
|
||||||
Subject: Revert "iwlwifi: mvm: fix scan config command size"
|
|
||||||
|
|
||||||
Since v5.4-rc1 was released, iwlwifi started throwing errors when scan
|
|
||||||
commands were sent to the firmware with certain devices (depending on
|
|
||||||
the OTP burned in the device, which contains the list of available
|
|
||||||
channels). For instance:
|
|
||||||
|
|
||||||
iwlwifi 0000:00:14.3: FW error in SYNC CMD SCAN_CFG_CMD
|
|
||||||
|
|
||||||
This bug was reported in the ArchLinux bug tracker:
|
|
||||||
https://bugs.archlinux.org/task/64703
|
|
||||||
|
|
||||||
And also in a specific case in bugzilla, when the lar_disabled option
|
|
||||||
was set: https://bugzilla.kernel.org/show_bug.cgi?id=205193
|
|
||||||
|
|
||||||
Revert the commit that introduced this error, by using the number of
|
|
||||||
channels from the OTP instead of the number of channels that is
|
|
||||||
specified in the FW TLV that tells us how many channels it supports.
|
|
||||||
|
|
||||||
This reverts commit 06eb547c4ae4382e70d556ba213d13c95ca1801b.
|
|
||||||
|
|
||||||
Cc: stable@vger.kernel.org # v5.4+
|
|
||||||
Signed-off-by: Mehmet Akif Tasova <makiftasova@gmail.com>
|
|
||||||
[ Luca: reworded the commit message a bit. ]
|
|
||||||
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
|
|
||||||
---
|
|
||||||
drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
|
|
||||||
index fcafa22ec6ce..8aa567d7912c 100644
|
|
||||||
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
|
|
||||||
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
|
|
||||||
@@ -1220,7 +1220,7 @@ static int iwl_mvm_legacy_config_scan(struct iwl_mvm *mvm)
|
|
||||||
cmd_size = sizeof(struct iwl_scan_config_v2);
|
|
||||||
else
|
|
||||||
cmd_size = sizeof(struct iwl_scan_config_v1);
|
|
||||||
- cmd_size += num_channels;
|
|
||||||
+ cmd_size += mvm->fw->ucode_capa.n_scan_channels;
|
|
||||||
|
|
||||||
cfg = kzalloc(cmd_size, GFP_KERNEL);
|
|
||||||
if (!cfg)
|
|
||||||
--
|
|
||||||
cgit v1.2.1-1-g437b
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'linux5.4'
|
# Template file for 'linux5.4'
|
||||||
pkgname=linux5.4
|
pkgname=linux5.4
|
||||||
version=5.4.15
|
version=5.4.16
|
||||||
revision=1
|
revision=1
|
||||||
wrksrc="linux-${version}"
|
wrksrc="linux-${version}"
|
||||||
short_desc="Linux kernel and modules (${version%.*} series)"
|
short_desc="Linux kernel and modules (${version%.*} series)"
|
||||||
|
@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
|
||||||
license="GPL-2.0-only"
|
license="GPL-2.0-only"
|
||||||
homepage="https://www.kernel.org"
|
homepage="https://www.kernel.org"
|
||||||
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
|
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
|
||||||
checksum=6407222f850f685b346011bd696a3216d5df0f37e0184099100d2724396d94b1
|
checksum=911541df2974782062f551ba0a818d7822ec69db4c41e590bcc7422398bada7a
|
||||||
patch_args="-Np1"
|
patch_args="-Np1"
|
||||||
|
|
||||||
nodebug=yes # -dbg package is generated below manually
|
nodebug=yes # -dbg package is generated below manually
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue