diff options
| author | stephen hemminger <stephen@networkplumber.org> | 2017-03-22 14:51:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-22 19:38:56 -0700 |
| commit | 00ecfb3b34b69dd702dee1bd6de6fc100be384db (patch) | |
| tree | 17a57e2ed6bec37b1502ef3e82a5711ecdc58b8e /drivers/net/hyperv | |
| parent | 43c7bd1ffcd1621c64cedf1be52156e2f95bba9b (diff) | |
| download | op-kernel-dev-00ecfb3b34b69dd702dee1bd6de6fc100be384db.zip op-kernel-dev-00ecfb3b34b69dd702dee1bd6de6fc100be384db.tar.gz | |
netvsc: remove unnecessary lock on shutdown
The channel inbound lock was not being used at all by the netvsc
device, but the spin_lock was helpful by providing necessary
barrier before waiting.
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv')
| -rw-r--r-- | drivers/net/hyperv/rndis_filter.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c index 3bd5447..cd7b837 100644 --- a/drivers/net/hyperv/rndis_filter.c +++ b/drivers/net/hyperv/rndis_filter.c @@ -926,8 +926,6 @@ static void rndis_filter_halt_device(struct rndis_device *dev) struct rndis_halt_request *halt; struct net_device_context *net_device_ctx = netdev_priv(dev->ndev); struct netvsc_device *nvdev = net_device_ctx->nvdev; - struct hv_device *hdev = net_device_ctx->device_ctx; - ulong flags; /* Attempt to do a rndis device halt */ request = get_rndis_request(dev, RNDIS_MSG_HALT, @@ -945,9 +943,10 @@ static void rndis_filter_halt_device(struct rndis_device *dev) dev->state = RNDIS_DEV_UNINITIALIZED; cleanup: - spin_lock_irqsave(&hdev->channel->inbound_lock, flags); nvdev->destroy = true; - spin_unlock_irqrestore(&hdev->channel->inbound_lock, flags); + + /* Force flag to be ordered before waiting */ + wmb(); /* Wait for all send completions */ wait_event(nvdev->wait_drain, netvsc_device_idle(nvdev)); |
