OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ibmvnic: Exit polling routine correctly during adapter reset 

This patch fixes a bug where, in the case of a device reset,
the polling routine will never complete, causing napi_disable
to sleep indefinitely when attempting to close the device.

Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Thomas Falcon 2017-06-14 23:50:09 -05:00 committed by David S. Miller
parent 1cf9cc72bd
commit 21ecba6c48
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/ibm/ibmvnic.c
View File

@ -1505,9 +1505,6 @@ static int ibmvnic_poll(struct napi_struct *napi, int budget)
int scrq_num = (int)(napi - adapter->napi);
int frames_processed = 0;
if (adapter->resetting)
return 0;
restart_poll:
while (frames_processed < budget) {
struct sk_buff *skb;
@ -1517,6 +1514,12 @@ restart_poll:
u16 offset;
u8 flags = 0;
if (unlikely(adapter->resetting)) {
enable_scrq_irq(adapter, adapter->rx_scrq[scrq_num]);
napi_complete_done(napi, frames_processed);
return frames_processed;
}
if (!pending_scrq(adapter, adapter->rx_scrq[scrq_num]))
break;
next = ibmvnic_next_scrq(adapter, adapter->rx_scrq[scrq_num]);