Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c5781b3 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Staging: hv: netvsc: Increase the timeout value in the netvsc driver 



On some loaded windows hosts, we have discovered that the host may not
respond to guest requests within the specified time (one second)
as evidenced by the guest timing out. Fix this problem by increasing
the timeout to 5 seconds.

It may be useful to apply this patch to the 3.0 kernel as well.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2dfde964

drivers/staging/hv/netvsc.c

+2 −2
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static int netvsc_init_recv_buf(struct hv_device *device) 
		goto cleanup;

	}



	t = wait_for_completion_timeout(&net_device->channel_init_wait, HZ);

	t = wait_for_completion_timeout(&net_device->channel_init_wait, 5*HZ);

	BUG_ON(t == 0);
@@ -357,7 +357,7 @@ static int netvsc_connect_vsp(struct hv_device *device) 
	if (ret != 0)

		goto cleanup;



	t = wait_for_completion_timeout(&net_device->channel_init_wait, HZ);

	t = wait_for_completion_timeout(&net_device->channel_init_wait, 5*HZ);



	if (t == 0) {

		ret = -ETIMEDOUT;

drivers/staging/hv/rndis_filter.c

+3 −3
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static int rndis_filter_query_device(struct rndis_device *dev, u32 oid, 
	if (ret != 0)

		goto Cleanup;



	t = wait_for_completion_timeout(&request->wait_event, HZ);

	t = wait_for_completion_timeout(&request->wait_event, 5*HZ);

	if (t == 0) {

		ret = -ETIMEDOUT;

		goto Cleanup;
@@ -528,7 +528,7 @@ static int rndis_filter_set_packet_filter(struct rndis_device *dev, 
	if (ret != 0)

		goto Cleanup;



	t = wait_for_completion_timeout(&request->wait_event, HZ);

	t = wait_for_completion_timeout(&request->wait_event, 5*HZ);



	if (t == 0) {

		ret = -1;
@@ -585,7 +585,7 @@ static int rndis_filter_init_device(struct rndis_device *dev) 
	}





	t = wait_for_completion_timeout(&request->wait_event, HZ);

	t = wait_for_completion_timeout(&request->wait_event, 5*HZ);



	if (t == 0) {

		ret = -ETIMEDOUT;