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

Commit 88275ed0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netvsc-next' 



K. Y. Srinivasan says:

====================
netvsc: Fix miscellaneous issues

Fix miscellaneous issues.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 71ee0307 386f5762

drivers/net/hyperv/netvsc_drv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -855,7 +855,7 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu) 
	struct hv_device *hdev = ndevctx->device_ctx;

	struct hv_device *hdev = ndevctx->device_ctx;

	struct netvsc_device_info device_info;

	struct netvsc_device_info device_info;

	bool was_running;

	bool was_running;

	int ret;

	int ret = 0;





	if (!nvdev || nvdev->destroy)

	if (!nvdev || nvdev->destroy)

		return -ENODEV;

		return -ENODEV;

drivers/net/hyperv/rndis_filter.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -1002,6 +1002,11 @@ static void netvsc_sc_open(struct vmbus_channel *new_sc) 
	if (!nvchan->mrc.buf)

	if (!nvchan->mrc.buf)

		return;

		return;





	/* Because the device uses NAPI, all the interrupt batching and

	 * control is done via Net softirq, not the channel handling

	 */

	set_channel_read_mode(new_sc, HV_CALL_ISR);



	ret = vmbus_open(new_sc, nvscdev->ring_size * PAGE_SIZE,

	ret = vmbus_open(new_sc, nvscdev->ring_size * PAGE_SIZE,

			 nvscdev->ring_size * PAGE_SIZE, NULL, 0,

			 nvscdev->ring_size * PAGE_SIZE, NULL, 0,

			 netvsc_channel_cb, nvchan);

			 netvsc_channel_cb, nvchan);