Merge pull request #103232 from teto/mptcp_official

linux_mptcp_5_9: init upstream multipath TCP at 5.9
This commit is contained in:
Matthieu Coudron
2020-11-12 22:15:02 +01:00
committed by GitHub
2 changed files with 5 additions and 38 deletions

View File

@@ -17987,18 +17987,11 @@ in
linux_mptcp = linux_mptcp_95;
linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp-94.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
]
++ lib.optionals ((stdenv.hostPlatform.platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
linux_mptcp_5_9 = linux_5_9.override {
structuredExtraConfig = with lib.kernel; {
MPTCP = yes;
MPTCP_IPV6 = yes;
};
};
linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix {