1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 280735da1963..55c359a1a052 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/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;