mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-10-31 08:24:59 +00:00
aa9b718d8a
Added a new patch to the 4.11 and 4.9 kernels based on a patch submitted to stable: https://patchwork.kernel.org/patch/9829039/ This patch fixes a off-by-one error in the VMBus code. Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
From 6e65be543a2f926a03d4e547430b4b36393cde4b Mon Sep 17 00:00:00 2001
|
|
From: Alex Ng <alexng@messages.microsoft.com>
|
|
Date: Sun, 6 Nov 2016 13:14:07 -0800
|
|
Subject: [PATCH 05/13] Drivers: hv: utils: Fix the mapping between host
|
|
version and protocol to use
|
|
|
|
We should intentionally declare the protocols to use for every known host
|
|
and default to using the latest protocol if the host is unknown or new.
|
|
|
|
Signed-off-by: Alex Ng <alexng@microsoft.com>
|
|
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
|
|
(cherry picked from commit 3da0401b4d0e17aea7526db0235d98fa535d903e)
|
|
---
|
|
drivers/hv/hv_util.c | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c
|
|
index bcd06306f3e8..e7707747f56d 100644
|
|
--- a/drivers/hv/hv_util.c
|
|
+++ b/drivers/hv/hv_util.c
|
|
@@ -389,16 +389,19 @@ static int util_probe(struct hv_device *dev,
|
|
ts_srv_version = TS_VERSION_1;
|
|
hb_srv_version = HB_VERSION_1;
|
|
break;
|
|
- case(VERSION_WIN10):
|
|
+ case VERSION_WIN7:
|
|
+ case VERSION_WIN8:
|
|
+ case VERSION_WIN8_1:
|
|
util_fw_version = UTIL_FW_VERSION;
|
|
sd_srv_version = SD_VERSION;
|
|
- ts_srv_version = TS_VERSION;
|
|
+ ts_srv_version = TS_VERSION_3;
|
|
hb_srv_version = HB_VERSION;
|
|
break;
|
|
+ case VERSION_WIN10:
|
|
default:
|
|
util_fw_version = UTIL_FW_VERSION;
|
|
sd_srv_version = SD_VERSION;
|
|
- ts_srv_version = TS_VERSION_3;
|
|
+ ts_srv_version = TS_VERSION;
|
|
hb_srv_version = HB_VERSION;
|
|
}
|
|
|
|
--
|
|
2.13.0
|
|
|