From f919c7faec86108c27d92e1bb8bd9841f8763aeb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 15 Nov 2017 01:00:16 +0100 Subject: [PATCH] linux_4_14: fix iwlwifi fw reset Currently, moving to kernel_4_14 breaks at least Intel Wireless 8260 and 8265 cards due to a API change in the firmware, which is not yet honored in the driver. --- pkgs/os-specific/linux/kernel/patches.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 13 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index c1288108b4f1..754a2372c6d8 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -62,4 +62,14 @@ rec { name = "tag-hardened"; patch = ./tag-hardened.patch; }; + + # https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6 + iwlwifi_mvm_support_version_7_scan_req_umac_fw_command = rec { + name = "iwlwifi_mvm_support_version_7_scan_req_umac_fw_command"; + patch = fetchpatch { + name = name + ".patch"; + url = https://bugzilla.kernel.org/attachment.cgi?id=260597; + sha256 = "09096npxpgvlwdz3pb3m9brvxh7vy0xc9z9p8hh85xyczyzcsjhr"; + }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6b50dcd00a1..7aacc2e89fc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12516,6 +12516,9 @@ with pkgs; # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long + + # https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6 + kernelPatches.iwlwifi_mvm_support_version_7_scan_req_umac_fw_command ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu