hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'netvsc-fix-module-removal-hangs' 

Stephen Hemminger says:

====================
netvsc: fix module removal hangs

A couple of patches are necessary to make netvsc driver module
removable again.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2017-03-12 23:15:44 -07:00
parent 115a731e52 79cd874c96
commit de12e4fb8f
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/hyperv/netvsc.c
View File

@ -91,15 +91,6 @@ static void free_netvsc_device(struct netvsc_device *nvdev)
}
static inline bool netvsc_channel_idle(const struct netvsc_device *net_device,
u16 q_idx)
{
const struct netvsc_channel *nvchan = &net_device->chan_table[q_idx];
return atomic_read(&net_device->num_outstanding_recvs) == 0 &&
atomic_read(&nvchan->queue_sends) == 0;
}
static struct netvsc_device *get_outbound_net_device(struct hv_device *device)
{
struct netvsc_device *net_device = hv_device_to_netvsc_device(device);
@ -571,8 +562,8 @@ void netvsc_device_remove(struct hv_device *device)
/* Now, we can close the channel safely */
vmbus_close(device->channel);
for (i = 0; i < VRSS_CHANNEL_MAX; i++)
napi_disable(&net_device->chan_table[0].napi);
for (i = 0; i < net_device->num_chn; i++)
napi_disable(&net_device->chan_table[i].napi);
/* Release all resources */
free_netvsc_device(net_device);
@ -1273,13 +1264,10 @@ void netvsc_channel_cb(void *context)
if (unlikely(!ndev))
return;
net_device = net_device_to_netvsc_device(ndev);
if (unlikely(net_device->destroy) &&
netvsc_channel_idle(net_device, q_idx))
return;
/* disable interupts from host */
hv_begin_read(&channel->inbound);
net_device = net_device_to_netvsc_device(ndev);
napi_schedule(&net_device->chan_table[q_idx].napi);
}