From c2759a8c193ef94bac1824fc1b5b8c5527682413 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Mon, 21 Mar 2011 14:10:15 +0100 Subject: [PATCH] --- yaml --- r: 345941 b: refs/heads/master c: 0916e0e308716387f16462f66b53c9128587fd0b h: refs/heads/master i: 345939: 26b72214bd9cba83f8150b9da3d3e8f4c96ecfc0 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a91d95847845..c45c89ab86cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0829f5edf37cb1731e97066288f520de85b7b5e5 +refs/heads/master: 0916e0e308716387f16462f66b53c9128587fd0b diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index f633c0bd52e4..a1deab6f1309 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -706,7 +706,7 @@ static void prepare_header95(struct p_header95 *h, enum drbd_packet cmd, int siz static void _prepare_header(struct drbd_tconn *tconn, int vnr, struct p_header *h, enum drbd_packet cmd, int size) { - if (tconn->agreed_pro_version >= 100 || size > DRBD_MAX_SIZE_H80_PACKET) + if (tconn->agreed_pro_version >= 95) prepare_header95(&h->h95, cmd, size); else prepare_header80(&h->h80, cmd, size); diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 6a3e628b68c6..27d4a4520641 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -819,9 +819,9 @@ static int drbd_connect(struct drbd_tconn *tconn) return -2; clear_bit(DISCARD_CONCURRENT, &tconn->flags); - tconn->agreed_pro_version = 99; - /* agreed_pro_version must be smaller than 100 so we send the old - header (h80) in the first packet and in the handshake packet. */ + + /* Assume that the peer only understands protocol 80 until we know better. */ + tconn->agreed_pro_version = 80; sock = NULL; msock = NULL;