From 29f7d041fbec97c2d80ef1a2de4d62a2910fb9e7 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Fri, 13 May 2011 12:03:55 +0200 Subject: [PATCH] --- yaml --- r: 251277 b: refs/heads/master c: a8e407925d49c521151dd24b6376c1f9a04a093f h: refs/heads/master i: 251275: e16d028417653166e4af3f030a7d19b9647beb37 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1de1a69594ee..8f70d9d6d519 100644 --- 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 index 0b17d426c32b..b0b0ba345e83 100644 --- 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)