colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "linux: fix brcmfmac driver"

Browse Source 
This reverts commit 141317dff9.
This commit is contained in:
K900 2023-03-13 14:38:06 +03:00
parent 755c177ff9
commit 5c0d228b6f
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -62,13 +62,4 @@
name = "fix-em-ice-bonding"; name = "fix-em-ice-bonding";
patch = ./fix-em-ice-bonding.patch; patch = ./fix-em-ice-bonding.patch;
}; };
# https://lore.kernel.org/linux-wireless/ZAx0TWRBlGfv7pNl@kroah.com/T/#m11e6e0915ab8fa19ce8bc9695ab288c0fe018edf
fix-brcmfmac = {
name = "fix-brcmfmac";
patch = fetchpatch {
url = "https://lore.kernel.org/linux-wireless/20230311141914.24444-1-marcan@marcan.st/raw";
sha256 = "sha256-Fjap48Lef8Mi1i0t13/rT2SoYcbO8HJuXhJMn7HK3Ds=";
};
};
} }

11
pkgs/top-level/linux-kernels.nix
View File

@ -34,8 +34,6 @@ let
major = lib.versions.major version; major = lib.versions.major version;
sha256 = kernelPatches.hardened.${kernel.meta.branch}.sha256; sha256 = kernelPatches.hardened.${kernel.meta.branch}.sha256;
modDirVersion' = builtins.replaceStrings [ kernel.version ] [ version ] kernel.modDirVersion; 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 { in kernel.override {
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
inherit stdenv lib version; inherit stdenv lib version;
@ -51,7 +49,7 @@ let
broken = kernel.meta.broken || (stdenv.isx86_64 && lib.versions.majorMinor version == "5.4"); broken = kernel.meta.broken || (stdenv.isx86_64 && lib.versions.majorMinor version == "5.4");
}; };
}; };
kernelPatches = basePatches ++ [ kernelPatches = kernel.kernelPatches ++ [
kernelPatches.hardened.${kernel.meta.branch} kernelPatches.hardened.${kernel.meta.branch}
]; ];
isHardened = true; isHardened = true;
@ -106,7 +104,6 @@ in {
# when adding a new linux version # when adding a new linux version
kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long kernelPatches.modinst_arg_list_too_long
kernelPatches.fix-brcmfmac
]; ];
}; };
@ -115,7 +112,6 @@ in {
[ kernelPatches.bridge_stp_helper [ kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.modinst_arg_list_too_long kernelPatches.modinst_arg_list_too_long
kernelPatches.fix-brcmfmac
]; ];
}; };
@ -124,7 +120,6 @@ in {
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.rtl8761b_support kernelPatches.rtl8761b_support
kernelPatches.fix-brcmfmac
]; ];
}; };
@ -139,7 +134,6 @@ in {
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.fix-brcmfmac
]; ];
}; };
@ -156,7 +150,6 @@ in {
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding kernelPatches.fix-em-ice-bonding
kernelPatches.fix-brcmfmac
]; ];
}; };
@ -173,7 +166,6 @@ in {
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding kernelPatches.fix-em-ice-bonding
kernelPatches.fix-brcmfmac
]; ];
}; };
@ -182,7 +174,6 @@ in {
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding kernelPatches.fix-em-ice-bonding
kernelPatches.fix-brcmfmac
]; ];
}; };