summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorLudovic Stordeur <Ludovic.Stordeur@inria.fr>2011-07-11 13:59:47 +0000
committerLudovic Stordeur <Ludovic.Stordeur@inria.fr>2011-07-11 13:59:47 +0000
commitb2cf02eb5ed43c0c87b3c8e51032b78a4d8f82b2 (patch)
treefac0092fcbf177eecdf4647c14d23a65679cb03f /pkgs/os-specific
parentc551998c82c3db0c09a43578d5d132e05652303a (diff)
downloadnixlib-b2cf02eb5ed43c0c87b3c8e51032b78a4d8f82b2.tar
nixlib-b2cf02eb5ed43c0c87b3c8e51032b78a4d8f82b2.tar.gz
nixlib-b2cf02eb5ed43c0c87b3c8e51032b78a4d8f82b2.tar.bz2
nixlib-b2cf02eb5ed43c0c87b3c8e51032b78a4d8f82b2.tar.lz
nixlib-b2cf02eb5ed43c0c87b3c8e51032b78a4d8f82b2.tar.xz
nixlib-b2cf02eb5ed43c0c87b3c8e51032b78a4d8f82b2.tar.zst
nixlib-b2cf02eb5ed43c0c87b3c8e51032b78a4d8f82b2.zip
Renamed cifs-timeout-2.6.{32 --> 29} patch
Renamed cifs-timeout-2.6.32 patch to cifs-timeout-2.6.29 as this is the
older kernel version this patch applies to.

svn path=/nixpkgs/trunk/; revision=27711
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/cifs-timeout-2.6.29.patch (renamed from pkgs/os-specific/linux/kernel/cifs-timeout-2.6.32.patch)0
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix6
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.32.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.29.patch
index b2dac3f016c4..b2dac3f016c4 100644
--- a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.32.patch
+++ b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.29.patch
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index d662d2bc65ad..62ecb55d0fc9 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -235,9 +235,9 @@ rec {
 
   # Increase the timeout on CIFS requests from 15 to 120 seconds to
   # make CIFS more resilient to high load on the CIFS server.
-  cifs_timeout_2_6_32 =
+  cifs_timeout_2_6_29 =
     { name = "cifs-timeout";
-      patch = ./cifs-timeout-2.6.32.patch;
+      patch = ./cifs-timeout-2.6.29.patch;
       features.cifsTimeout = true;
     };
 
@@ -253,7 +253,7 @@ rec {
       features.cifsTimeout = true;
     };
 
-  cifs_timeout = cifs_timeout_2_6_32;
+  cifs_timeout = cifs_timeout_2_6_29;
 
   no_xsave =
     { name = "no-xsave";