Merge pull request #31678 from flokli/fix-iwlwifi-linux-4.14

linux_4_14: fix iwlwifi fw reset
This commit is contained in:
Orivej Desh 2017-11-15 11:32:53 +00:00 committed by GitHub
commit a7f4d977a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions

View File

@ -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";
};
};
}

View File

@ -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