---

yaml --- r: 251277 b: refs/heads/master c: a8e4079 h: refs/heads/master i: 251275: e16d028 v: v3
git-mirror · May 24, 2011 · 29f7d04 · 29f7d04
1 parent 2e49103
commit 29f7d04
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76727f684aa2d6a2dc59a7e5cf77e092a1bf4fb6
+refs/heads/master: a8e407925d49c521151dd24b6376c1f9a04a093f
diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c
@@ -787,7 +787,7 @@ static int drbd_connect(struct drbd_conf *mdev)
 		}
 
 		if (sock && msock) {
-			schedule_timeout_interruptible(HZ / 10);
+			schedule_timeout_interruptible(mdev->net_conf->ping_timeo*HZ/10);
 			ok = drbd_socket_okay(mdev, &sock);
 			ok = drbd_socket_okay(mdev, &msock) && ok;
 			if (ok)