diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-28 20:38:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-28 20:38:41 -0400 |
| commit | 45d120d42b87bdbe1f49e7b33ff986a9dae8debf (patch) | |
| tree | 5dfbb9f9e0eead3803cfb371580f2b508c0bc9f4 /pkgs/os-specific/linux | |
| parent | 9a2345e963fc072ff09f7528bf6bf01015a8dc57 (diff) | |
| parent | 8585bd87a01a3de0f2ee17bc7f28b84481013c7e (diff) | |
| download | nixlib-45d120d42b87bdbe1f49e7b33ff986a9dae8debf.tar nixlib-45d120d42b87bdbe1f49e7b33ff986a9dae8debf.tar.gz nixlib-45d120d42b87bdbe1f49e7b33ff986a9dae8debf.tar.bz2 nixlib-45d120d42b87bdbe1f49e7b33ff986a9dae8debf.tar.lz nixlib-45d120d42b87bdbe1f49e7b33ff986a9dae8debf.tar.xz nixlib-45d120d42b87bdbe1f49e7b33ff986a9dae8debf.tar.zst nixlib-45d120d42b87bdbe1f49e7b33ff986a9dae8debf.zip | |
Merge pull request #39849 from teto/mptcp94
linux_mptcp: 0.93 -> 0.94
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-mptcp-93.nix | 47 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-mptcp.nix | 6 |
2 files changed, 50 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix b/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix new file mode 100644 index 000000000000..2efe357cbd68 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix @@ -0,0 +1,47 @@ +{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: + +buildLinux (rec { + mptcpVersion = "0.93"; + modDirVersion = "4.9.60"; + version = "${modDirVersion}-mptcp_v${mptcpVersion}"; + + extraMeta = { + branch = "4.4"; + maintainers = with stdenv.lib.maintainers; [ teto layus ]; + }; + + src = fetchFromGitHub { + owner = "multipath-tcp"; + repo = "mptcp"; + rev = "v${mptcpVersion}"; + sha256 = "1irlppzvcmckrazs2c4vg6y8ji31552izc3wqabf401v57jvxcys"; + }; + + extraConfig = '' + IPV6 y + MPTCP y + IP_MULTIPLE_TABLES y + + # Enable advanced path-managers... + MPTCP_PM_ADVANCED y + MPTCP_FULLMESH y + MPTCP_NDIFFPORTS y + # ... but use none by default. + # The default is safer if source policy routing is not setup. + DEFAULT_DUMMY y + DEFAULT_MPTCP_PM default + + # MPTCP scheduler selection. + # Disabled as the only non-default is the useless round-robin. + MPTCP_SCHED_ADVANCED n + DEFAULT_MPTCP_SCHED default + + # Smarter TCP congestion controllers + TCP_CONG_LIA m + TCP_CONG_OLIA m + TCP_CONG_WVEGAS m + TCP_CONG_BALIA m + + '' + (args.extraConfig or ""); +} // args) + diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index d486bd1d6d24..a439fd0a6ec5 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,8 +1,8 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: buildLinux (rec { - mptcpVersion = "0.93"; - modDirVersion = "4.9.60"; + mptcpVersion = "0.94"; + modDirVersion = "4.14.24"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; # autoModules= true; @@ -15,7 +15,7 @@ buildLinux (rec { owner = "multipath-tcp"; repo = "mptcp"; rev = "v${mptcpVersion}"; - sha256 = "1irlppzvcmckrazs2c4vg6y8ji31552izc3wqabf401v57jvxcys"; + sha256 = "01y3jf5awdxcv6vfpr30n0vaa8w1wgip0whiv88d610550299hkv"; }; extraConfig = '' |