diff options
| -rw-r--r-- | drivers/hv/connection.c | 15 | ||||
| -rw-r--r-- | include/linux/hyperv.h | 15 |
2 files changed, 15 insertions, 15 deletions
diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c index 0d8b13290e93..56b14e57bdd8 100644 --- a/drivers/hv/connection.c +++ b/drivers/hv/connection.c | |||
| @@ -41,21 +41,6 @@ struct vmbus_connection vmbus_connection = { | |||
| 41 | }; | 41 | }; |
| 42 | 42 | ||
| 43 | /* | 43 | /* |
| 44 | * VMBUS version is 32 bit entity broken up into | ||
| 45 | * two 16 bit quantities: major_number. minor_number. | ||
| 46 | * | ||
| 47 | * 0 . 13 (Windows Server 2008) | ||
| 48 | * 1 . 1 (Windows 7) | ||
| 49 | * 2 . 4 (Windows 8) | ||
| 50 | */ | ||
| 51 | |||
| 52 | #define VERSION_WS2008 ((0 << 16) | (13)) | ||
| 53 | #define VERSION_WIN7 ((1 << 16) | (1)) | ||
| 54 | #define VERSION_WIN8 ((2 << 16) | (4)) | ||
| 55 | |||
| 56 | #define VERSION_INVAL -1 | ||
| 57 | |||
| 58 | /* | ||
| 59 | * Negotiated protocol version with the host. | 44 | * Negotiated protocol version with the host. |
| 60 | */ | 45 | */ |
| 61 | __u32 vmbus_proto_version; | 46 | __u32 vmbus_proto_version; |
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 134a2022a7a3..e72502689cdc 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h | |||
| @@ -419,6 +419,21 @@ hv_get_ringbuffer_availbytes(struct hv_ring_buffer_info *rbi, | |||
| 419 | */ | 419 | */ |
| 420 | #define HV_DRV_VERSION "3.1" | 420 | #define HV_DRV_VERSION "3.1" |
| 421 | 421 | ||
| 422 | /* | ||
| 423 | * VMBUS version is 32 bit entity broken up into | ||
| 424 | * two 16 bit quantities: major_number. minor_number. | ||
| 425 | * | ||
| 426 | * 0 . 13 (Windows Server 2008) | ||
| 427 | * 1 . 1 (Windows 7) | ||
| 428 | * 2 . 4 (Windows 8) | ||
| 429 | */ | ||
| 430 | |||
| 431 | #define VERSION_WS2008 ((0 << 16) | (13)) | ||
| 432 | #define VERSION_WIN7 ((1 << 16) | (1)) | ||
| 433 | #define VERSION_WIN8 ((2 << 16) | (4)) | ||
| 434 | |||
| 435 | #define VERSION_INVAL -1 | ||
| 436 | |||
| 422 | 437 | ||
| 423 | /* Make maximum size of pipe payload of 16K */ | 438 | /* Make maximum size of pipe payload of 16K */ |
| 424 | #define MAX_PIPE_DATA_PAYLOAD (sizeof(u8) * 16384) | 439 | #define MAX_PIPE_DATA_PAYLOAD (sizeof(u8) * 16384) |
