]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
hv_netvsc: pass netvsc_device to rndis halt
authorStephen Hemminger <stephen@networkplumber.org>
Fri, 16 Mar 2018 22:44:27 +0000 (15:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 18 Mar 2018 00:10:27 +0000 (20:10 -0400)
The caller has a valid pointer, pass it to rndis_filter_halt_device
and avoid any possible RCU races here.

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/hyperv/rndis_filter.c

index 8927c483c21738a3f9b7885c35391cff8f052f08..668680abaffb08111562c8f26f77e86fcd571278 100644 (file)
@@ -944,12 +944,11 @@ static bool netvsc_device_idle(const struct netvsc_device *nvdev)
        return true;
 }
 
-static void rndis_filter_halt_device(struct rndis_device *dev)
+static void rndis_filter_halt_device(struct netvsc_device *nvdev,
+                                    struct rndis_device *dev)
 {
        struct rndis_request *request;
        struct rndis_halt_request *halt;
-       struct net_device_context *net_device_ctx = netdev_priv(dev->ndev);
-       struct netvsc_device *nvdev = rtnl_dereference(net_device_ctx->nvdev);
 
        /* Attempt to do a rndis device halt */
        request = get_rndis_request(dev, RNDIS_MSG_HALT,
@@ -1348,7 +1347,7 @@ void rndis_filter_device_remove(struct hv_device *dev,
        cancel_work_sync(&net_dev->subchan_work);
 
        /* Halt and release the rndis device */
-       rndis_filter_halt_device(rndis_dev);
+       rndis_filter_halt_device(net_dev, rndis_dev);
 
        net_dev->extension = NULL;