Get rid of release_inbound_net_device() by inlining the code.
Signed-off-by: K. Y. Srinivasan <[email protected]>
Signed-off-by: Haiyang Zhang <[email protected]>
Signed-off-by: Abhishek Kane <[email protected]>
Signed-off-by: Hank Janssen <[email protected]>
---
drivers/staging/hv/netvsc.c | 44 +++++++++---------------------------------
1 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
index 7761370..f930b9e 100644
--- a/drivers/staging/hv/netvsc.c
+++ b/drivers/staging/hv/netvsc.c
@@ -100,28 +100,6 @@ static void put_net_device(struct hv_device *device)
spin_unlock_irqrestore(&device->ext_lock, flags);
}
-static struct netvsc_device *release_inbound_net_device(
- struct hv_device *device)
-{
- struct netvsc_device *net_device;
- unsigned long flags;
-
- spin_lock_irqsave(&device->ext_lock, flags);
- net_device = device->ext;
- if (net_device == NULL) {
- spin_unlock_irqrestore(&device->ext_lock, flags);
- return NULL;
- }
-
- /* Busy wait until the ref drop to 1, then set it to 0 */
- while (atomic_cmpxchg(&net_device->refcnt, 1, 0) != 1)
- udelay(100);
-
- device->ext = NULL;
- spin_unlock_irqrestore(&device->ext_lock, flags);
- return net_device;
-}
-
static int netvsc_destroy_recv_buf(struct netvsc_device *net_device)
{
struct nvsp_message *revoke_packet;
@@ -402,6 +380,7 @@ int netvsc_device_remove(struct hv_device *device)
{
struct netvsc_device *net_device;
struct hv_netvsc_packet *netvsc_packet, *pos;
+ unsigned long flags;
/* Stop outbound traffic ie sends and receives completions */
@@ -413,18 +392,17 @@ int netvsc_device_remove(struct hv_device *device)
atomic_dec(&net_device->refcnt);
net_device->destroy = true;
- /* Wait for all send completions */
- while (atomic_read(&net_device->num_outstanding_sends)) {
- dev_info(&device->device,
- "waiting for %d requests to complete...\n",
- atomic_read(&net_device->num_outstanding_sends));
- udelay(100);
- }
-
+ /*
+ * At this point, all outbound traffic is disabled. Wait
+ * for outstanding sends to drain out.
+ */
+ netvsc_wait_to_drain(net_device);
netvsc_disconnect_vsp(net_device);
- /* Stop inbound traffic ie receives and sends completions */
- net_device = release_inbound_net_device(device);
+ spin_lock_irqsave(&device->ext_lock, flags);
+ atomic_set(&net_device->refcnt, 0);
+ device->ext = NULL;
+ spin_unlock_irqrestore(&device->ext_lock, flags);
/* At this point, no one should be accessing netDevice except in here */
dev_notice(&device->device, "net device safe to remove\n");
@@ -986,8 +964,6 @@ cleanup:
kfree(packet);
}
- release_inbound_net_device(device);
-
kfree(net_device);
}
--
1.7.4.1
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
