From 4754606bccc9fe637894e42685f1185381219f8d Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Sat, 1 Dec 2012 06:46:56 -0800 Subject: [PATCH] --- yaml --- r: 354999 b: refs/heads/master c: 2a5c43a821b3b26e6af1cdb987b4daeba6f13a6f h: refs/heads/master i: 354997: 186d786c1b0520d51ea26c7b18be7977905b5b3e 354995: db8d6f04771c614e2eef4415e702f1b5dd898e57 354991: eb23bc01db6c270fbe2d9cdadd84917c09b41a83 v: v3 --- [refs] | 2 +- trunk/drivers/hv/connection.c | 2 +- trunk/include/linux/hyperv.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 73caf0203446..aaf1e0e82327 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ab05951c586a2ed9e19a3ed8c437346bfabbfb7 +refs/heads/master: 2a5c43a821b3b26e6af1cdb987b4daeba6f13a6f diff --git a/trunk/drivers/hv/connection.c b/trunk/drivers/hv/connection.c index ac71653abb77..3965537a659d 100644 --- a/trunk/drivers/hv/connection.c +++ b/trunk/drivers/hv/connection.c @@ -194,7 +194,7 @@ int vmbus_connect(void) * version. */ - version = VERSION_WS2008; + version = VERSION_CURRENT; do { ret = vmbus_negotiate_version(msginfo, version); diff --git a/trunk/include/linux/hyperv.h b/trunk/include/linux/hyperv.h index 8c3cb1fc34d4..5095b066df94 100644 --- a/trunk/include/linux/hyperv.h +++ b/trunk/include/linux/hyperv.h @@ -434,6 +434,7 @@ hv_get_ringbuffer_availbytes(struct hv_ring_buffer_info *rbi, #define VERSION_INVAL -1 +#define VERSION_CURRENT VERSION_WIN8 /* Make maximum size of pipe payload of 16K */ #define MAX_PIPE_DATA_PAYLOAD (sizeof(u8) * 16384)