Message ID | 20170824185002.10213-1-haiyangz@exchange.microsoft.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Haiyang Zhang <haiyangz@exchange.microsoft.com> Date: Thu, 24 Aug 2017 11:50:02 -0700 > From: Haiyang Zhang <haiyangz@microsoft.com> > > 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: Haiyang Zhang <haiyangz@microsoft.com> Applied.
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index c0c4c9195a3f..fac44c5c8d0d 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -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);