mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-11-01 13:41:44 +00:00
0f9ec7f1d2
While testing the patches on Windows we found some issues
which commit d0e6020dd2b25f8880 ("hvsock: fix a race in
hvs_stream_dequeue()") (cherry-picked as 0009) attempts to
fix.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 1ee84d4b4cceac4c7f42573476c1253b06e8cdaf Mon Sep 17 00:00:00 2001
|
|
From: Dexuan Cui <decui@microsoft.com>
|
|
Date: Fri, 5 May 2017 16:57:35 -0600
|
|
Subject: [PATCH 8/9] hv_sock: add the support of auto-loading
|
|
|
|
After we disable VMWare virtual sockets driver's auto-loading on Hyper-V,
|
|
we can enable hv_sock's auto-loading now.
|
|
|
|
Signed-off-by: Dexuan Cui <decui@microsoft.com>
|
|
Cc: K. Y. Srinivasan <kys@microsoft.com>
|
|
Cc: Haiyang Zhang <haiyangz@microsoft.com>
|
|
Cc: Stephen Hemminger <sthemmin@microsoft.com>
|
|
Origin: https://github.com/dcui/linux/commits/decui/hv_sock/v4.11/20170511
|
|
(cherry picked from commit 6f1aa69011356ff95ed6c57400095e5f2d9eb900)
|
|
---
|
|
net/vmw_vsock/hyperv_transport.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c
|
|
index fd89bf357617..f465b0b662df 100644
|
|
--- a/net/vmw_vsock/hyperv_transport.c
|
|
+++ b/net/vmw_vsock/hyperv_transport.c
|
|
@@ -827,3 +827,4 @@ module_exit(hvs_exit);
|
|
MODULE_DESCRIPTION("Hyper-V sockets");
|
|
MODULE_VERSION("1.0.0");
|
|
MODULE_LICENSE("GPL");
|
|
+MODULE_ALIAS_NETPROTO(PF_VSOCK);
|
|
--
|
|
2.12.2
|
|
|