Page MenuHomeFreeBSD

D5435.id.diff
No OneTemporary

D5435.id.diff

Index: head/sys/dev/hyperv/netvsc/hv_rndis_filter.c
===================================================================
--- head/sys/dev/hyperv/netvsc/hv_rndis_filter.c
+++ head/sys/dev/hyperv/netvsc/hv_rndis_filter.c
@@ -352,7 +352,7 @@
goto cleanup;
}
- ret = sema_timedwait(&request->wait_sema, 500);
+ ret = sema_timedwait(&request->wait_sema, 5 * hz);
if (ret != 0) {
device_printf(dev, "hv send offload request timeout\n");
goto cleanup;
@@ -619,7 +619,7 @@
* us when the response has arrived. In the failure case,
* sema_timedwait() returns a non-zero status after waiting 5 seconds.
*/
- ret = sema_timedwait(&request->wait_sema, 500);
+ ret = sema_timedwait(&request->wait_sema, 5 * hz);
if (ret == 0) {
/* Response received, check status */
set_complete = &request->response_msg.msg.set_complete;
Index: head/sys/dev/hyperv/vmbus/hv_channel.c
===================================================================
--- head/sys/dev/hyperv/vmbus/hv_channel.c
+++ head/sys/dev/hyperv/vmbus/hv_channel.c
@@ -30,6 +30,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
@@ -194,7 +195,7 @@
if (ret != 0)
goto cleanup;
- ret = sema_timedwait(&open_info->wait_sema, 500); /* KYS 5 seconds */
+ ret = sema_timedwait(&open_info->wait_sema, 5 * hz); /* KYS 5 seconds */
if (ret) {
if(bootverbose)
@@ -439,7 +440,7 @@
}
}
- ret = sema_timedwait(&msg_info->wait_sema, 500); /* KYS 5 seconds*/
+ ret = sema_timedwait(&msg_info->wait_sema, 5 * hz); /* KYS 5 seconds*/
if (ret != 0)
goto cleanup;
@@ -499,7 +500,7 @@
if (ret != 0)
goto cleanup;
- ret = sema_timedwait(&info->wait_sema, 500); /* KYS 5 seconds */
+ ret = sema_timedwait(&info->wait_sema, 5 * hz); /* KYS 5 seconds */
cleanup:
/*
Index: head/sys/dev/hyperv/vmbus/hv_connection.c
===================================================================
--- head/sys/dev/hyperv/vmbus/hv_connection.c
+++ head/sys/dev/hyperv/vmbus/hv_connection.c
@@ -27,6 +27,7 @@
*/
#include <sys/param.h>
+#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/systm.h>
#include <sys/lock.h>
@@ -121,7 +122,7 @@
/**
* Wait for the connection response
*/
- ret = sema_timedwait(&msg_info->wait_sema, 500); /* KYS 5 seconds */
+ ret = sema_timedwait(&msg_info->wait_sema, 5 * hz); /* KYS 5 seconds */
mtx_lock_spin(&hv_vmbus_g_connection.channel_msg_lock);
TAILQ_REMOVE(

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 25, 2:28 AM (3 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30291906
Default Alt Text
D5435.id.diff (2 KB)

Event Timeline