summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/block/drbd/drbd_receiver.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 26c30fd64ec..d507700df85 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -901,8 +901,6 @@ static int conn_connect(struct drbd_tconn *tconn)
msock.rbuf = tconn->meta.rbuf;
msock.socket = NULL;
- clear_bit(DISCARD_CONCURRENT, &tconn->flags);
-
/* Assume that the peer only understands protocol 80 until we know better. */
tconn->agreed_pro_version = 80;
@@ -918,6 +916,7 @@ static int conn_connect(struct drbd_tconn *tconn)
sock.socket = s;
send_first_packet(tconn, &sock, P_INITIAL_DATA);
} else if (!msock.socket) {
+ clear_bit(DISCARD_CONCURRENT, &tconn->flags);
msock.socket = s;
send_first_packet(tconn, &msock, P_INITIAL_META);
} else {