From 5b835cbfe85318e403d00293687b2b4f0220c7de Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Sat, 4 Aug 2012 01:07:55 +0200 Subject: [PATCH] --- yaml --- r: 346232 b: refs/heads/master c: e959d08d3ef6e48bc3b726bcc07a4ebb9989be94 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 328002b7f7f4..4ec697a2d6a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 519b6d3eac823e4ceec10484bc06f239047cebbf +refs/heads/master: e959d08d3ef6e48bc3b726bcc07a4ebb9989be94 diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 26c30fd64ecf..d507700df85c 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/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 {