diff options
| author | Andreas Gruenbacher | 2011-03-21 14:10:15 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:44:51 +0100 |
| commit | 0916e0e308716387f16462f66b53c9128587fd0b (patch) | |
| tree | e220018d0b28b983b21ff0ab8b4abd1912795f1c /drivers/block/drbd/drbd_main.c | |
| parent | drbd: drbd_connected(): Return an error code upon failure. (diff) | |
| download | kernel-qcow2-linux-0916e0e308716387f16462f66b53c9128587fd0b.tar.gz kernel-qcow2-linux-0916e0e308716387f16462f66b53c9128587fd0b.tar.xz kernel-qcow2-linux-0916e0e308716387f16462f66b53c9128587fd0b.zip | |
drbd: Always use the same protocol version for the same peer
There is no need to send protocol 80 headers to peers that understand
protocol 95 headers. Make sure that we don't send protocol 95 headers
until we have agreed upon a protocol version with our peer, though.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index f633c0bd52e4..a1deab6f1309 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/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); |