diff options
| author |   stephen hemminger <stephen@networkplumber.org> | 2017-03-09 15:04:14 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-03-12 23:15:43 -0700 |
| commit | 0d6dd35784e76bc3e052ffa13c6839d5c9bcb449 (patch) | |
| tree | 801dc16861dd4d9da770362a305cc3a79ddfefe1 /drivers/net/hyperv | |
| parent | Merge branch 'dpaa_eth-next' of git://git.freescale.com/ppc/upstream/linux (diff) | |
| download | linux-dev-0d6dd35784e76bc3e052ffa13c6839d5c9bcb449.tar.xz linux-dev-0d6dd35784e76bc3e052ffa13c6839d5c9bcb449.zip | |
netvsc: need napi scheduled during removal
Since rndis_halt_device waits until all outstanding sends and
receives are completed. Netvsc device needs to still schedule
NAPI to see those completions.
Fixes: 2506b1dc4bbe ("netvsc: implement NAPI")
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/netvsc.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index b1328cef9d5a..0e0c757c1681 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -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); @@ -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); } |