diff options
author | K900 <me@0upti.me> | 2023-03-13 14:38:06 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2023-03-13 14:38:06 +0300 |
commit | 5c0d228b6fee8efe1c163e71d11256610e6463a4 (patch) | |
tree | 9139ed0de33373012f190f13fd2fe9e94a403160 /pkgs/top-level/linux-kernels.nix | |
parent | 755c177ff9d7e6854ecd0f7a1218ee09bcb301b7 (diff) |
Revert "linux: fix `brcmfmac` driver"
This reverts commit 141317dff92656e67ffb726c727766ceffcba52b.
Diffstat (limited to 'pkgs/top-level/linux-kernels.nix')
-rw-r--r-- | pkgs/top-level/linux-kernels.nix | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index a713535aef576..14767d88c1f3b 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -34,8 +34,6 @@ let major = lib.versions.major version; sha256 = kernelPatches.hardened.${kernel.meta.branch}.sha256; modDirVersion' = builtins.replaceStrings [ kernel.version ] [ version ] kernel.modDirVersion; - # FIXME remove as soon as the revert happened upstream! - basePatches = lib.filter ({ name, ... }: name != "fix-brcmfmac") kernel.kernelPatches; in kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { inherit stdenv lib version; @@ -51,7 +49,7 @@ let broken = kernel.meta.broken || (stdenv.isx86_64 && lib.versions.majorMinor version == "5.4"); }; }; - kernelPatches = basePatches ++ [ + kernelPatches = kernel.kernelPatches ++ [ kernelPatches.hardened.${kernel.meta.branch} ]; isHardened = true; @@ -106,7 +104,6 @@ in { # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - kernelPatches.fix-brcmfmac ]; }; @@ -115,7 +112,6 @@ in { [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.fix-brcmfmac ]; }; @@ -124,7 +120,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.rtl8761b_support - kernelPatches.fix-brcmfmac ]; }; @@ -139,7 +134,6 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.fix-brcmfmac ]; }; @@ -156,7 +150,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.fix-em-ice-bonding - kernelPatches.fix-brcmfmac ]; }; @@ -173,7 +166,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.fix-em-ice-bonding - kernelPatches.fix-brcmfmac ]; }; @@ -182,7 +174,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.fix-em-ice-bonding - kernelPatches.fix-brcmfmac ]; }; |