From 86e03959af0d32193637a87ac9a912c3ec051c25 Mon Sep 17 00:00:00 2001
From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Mon, 20 Jun 2011 22:21:19 +0200
Subject: [PATCH] --- yaml --- r: 309295 b: refs/heads/master c:
 071cf1c9a7043660be08358e4b508f62120f224b h: refs/heads/master i:   309293:
 a7b9e8a1719a2831336a6739dae16056f2295ccd   309291:
 679ef014dcf9ac023130fa4c4339a2d2bba61086   309287:
 5373a417e54e4d1d70401de5411efd8822eeeed7   309279:
 a2f79ef5c8a7f13ed102f34033bed5a9619a422e v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/drbd_limits.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5cbbdfe0943b..ca33134660a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f138ce01ae6430db2e2cebd0a945dff75581d62
+refs/heads/master: 071cf1c9a7043660be08358e4b508f62120f224b
diff --git a/trunk/include/linux/drbd_limits.h b/trunk/include/linux/drbd_limits.h
index 447c36752385..928c84dfaf42 100644
--- a/trunk/include/linux/drbd_limits.h
+++ b/trunk/include/linux/drbd_limits.h
@@ -60,7 +60,7 @@
 
  /* timeout for the ping packets.*/
 #define DRBD_PING_TIMEO_MIN  1
-#define DRBD_PING_TIMEO_MAX  100
+#define DRBD_PING_TIMEO_MAX  300
 #define DRBD_PING_TIMEO_DEF  5
 
   /* max number of write requests between write barriers */