diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch new file mode 100644 index 00000000000..13d17ad6485 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch @@ -0,0 +1,13 @@ +--- a/fs/cifs/transport.c.old 2012-11-06 10:53:23.640093369 +0100 ++++ a/fs/cifs/transport.c 2012-11-06 10:54:31.835469340 +0100 +@@ -176,8 +176,8 @@ + * after the retries we will kill the socket and + * reconnect which may clear the network problem. + */ +- if ((i >= 14) || (!server->noblocksnd && (i > 2))) { +- cERROR(1, "sends on sock %p stuck for 15 seconds", ++ if ((i >= 119) || (!server->noblocksnd && (i > 2))) { ++ cERROR(1, "sends on sock %p stuck for 119 seconds", + ssocket); + rc = -EAGAIN; + break; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 0699f09c505..d42581e457e 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -230,6 +230,12 @@ rec { features.cifsTimeout = true; }; + cifs_timeout_3_5_7 = + { name = "cifs-timeout"; + patch = ./cifs-timeout-3.5.7.patch; + features.cifsTimeout = true; + }; + no_xsave = { name = "no-xsave"; patch = ./no-xsave.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91804be3212..bc184180557 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5897,6 +5897,7 @@ let kernelPatches.sec_perm_2_6_24 kernelPatches.aufs3_5 kernelPatches.perf3_5 + kernelPatches.cifs_timeout_3_5_7 ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill