From 5d3755fd12cf67a218003c23bfb00b36307858cc Mon Sep 17 00:00:00 2001
From: Philipp Reisner <philipp.reisner@linbit.com>
Date: Fri, 3 Aug 2012 15:14:04 +0200
Subject: [PATCH] --- yaml --- r: 345688 b: refs/heads/master c:
 c12a3d8c84a5e9913a97ca5e6513c913a7e5b288 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/block/drbd/drbd_receiver.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0320967cf80a..1cbd2d170980 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02b91b55260f7a1bdc8da25866cf27f726f5788f
+refs/heads/master: c12a3d8c84a5e9913a97ca5e6513c913a7e5b288
diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c
index 280735da1963..55c359a1a052 100644
--- a/trunk/drivers/block/drbd/drbd_receiver.c
+++ b/trunk/drivers/block/drbd/drbd_receiver.c
@@ -763,8 +763,6 @@ static int drbd_connect(struct drbd_conf *mdev)
 	if (drbd_request_state(mdev, NS(conn, C_WF_CONNECTION)) < SS_SUCCESS)
 		return -2;
 
-	clear_bit(DISCARD_CONCURRENT, &mdev->flags);
-
 	sock  = NULL;
 	msock = NULL;
 
@@ -784,6 +782,7 @@ static int drbd_connect(struct drbd_conf *mdev)
 				sock = s;
 				s = NULL;
 			} else if (!msock) {
+				clear_bit(DISCARD_CONCURRENT, &mdev->flags);
 				drbd_send_fp(mdev, s, P_HAND_SHAKE_M);
 				msock = s;
 				s = NULL;