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

Commit c6f71c41 authored by Haiyang Zhang's avatar Haiyang Zhang Committed by David S. Miller
Browse files

hv_netvsc: Fix rndis_filter_close error during netvsc_remove 



We now remove rndis filter before unregister_netdev(), which calls
device close. It involves closing rndis filter already removed.

This patch fixes this error.

Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0cf3f4c3

drivers/net/hyperv/netvsc_drv.c

+6 −1
Original line number Diff line number Diff line
@@ -119,12 +119,16 @@ static int netvsc_close(struct net_device *net) 
	struct net_device *vf_netdev

		= rtnl_dereference(net_device_ctx->vf_netdev);

	struct netvsc_device *nvdev = rtnl_dereference(net_device_ctx->nvdev);

	int ret;

	int ret = 0;

	u32 aread, i, msec = 10, retry = 0, retry_max = 20;

	struct vmbus_channel *chn;



	netif_tx_disable(net);



	/* No need to close rndis filter if it is removed already */

	if (!nvdev)

		goto out;



	ret = rndis_filter_close(nvdev);

	if (ret != 0) {

		netdev_err(net, "unable to close device (ret %d).\n", ret);
@@ -163,6 +167,7 @@ static int netvsc_close(struct net_device *net) 
		ret = -ETIMEDOUT;

	}



out:

	if (vf_netdev)

		dev_close(vf_netdev);