From c38b9c7118b95aa48bfa38d3bcd241dba3d23c10 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Sat, 27 Aug 2011 11:31:12 -0700
Subject: [PATCH] Staging: hv: netvsc: Introduce state to manage the lifecycle
of net device
Introduce state to manage the lifecycle of net device.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/staging/hv/hyperv_net.h | 1 +
drivers/staging/hv/netvsc.c | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/drivers/staging/hv/hyperv_net.h b/drivers/staging/hv/hyperv_net.h
index 5782fea9a17a..0b347c1edc36 100644
--- a/drivers/staging/hv/hyperv_net.h
+++ b/drivers/staging/hv/hyperv_net.h
@@ -371,6 +371,7 @@ struct netvsc_device {
atomic_t refcnt;
atomic_t num_outstanding_sends;
+ bool destroy;
/*
* List of free preallocated hv_netvsc_packet to represent receive
* packet
diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
index 772210268787..8eb4039b5ff8 100644
--- a/drivers/staging/hv/netvsc.c
+++ b/drivers/staging/hv/netvsc.c
@@ -43,6 +43,7 @@ static struct netvsc_device *alloc_net_device(struct hv_device *device)
/* Set to 2 to allow both inbound and outbound traffic */
atomic_set(&net_device->refcnt, 2);
+ net_device->destroy = false;
net_device->dev = device;
device->ext = net_device;
@@ -396,6 +397,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 */
net_device = release_outbound_net_device(device);
@@ -404,6 +406,10 @@ int netvsc_device_remove(struct hv_device *device)
return -ENODEV;
}
+ spin_lock_irqsave(&device->channel->inbound_lock, flags);
+ net_device->destroy = true;
+ spin_unlock_irqrestore(&device->channel->inbound_lock, flags);
+
/* Wait for all send completions */
while (atomic_read(&net_device->num_outstanding_sends)) {
dev_err(&device->device,
--
GitLab