Commit 21ecba6c authored by Thomas Falcon's avatar Thomas Falcon Committed by David S. Miller

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: default avatarThomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1cf9cc72
...@@ -1505,9 +1505,6 @@ static int ibmvnic_poll(struct napi_struct *napi, int budget) ...@@ -1505,9 +1505,6 @@ static int ibmvnic_poll(struct napi_struct *napi, int budget)
int scrq_num = (int)(napi - adapter->napi); int scrq_num = (int)(napi - adapter->napi);
int frames_processed = 0; int frames_processed = 0;
if (adapter->resetting)
return 0;
restart_poll: restart_poll:
while (frames_processed < budget) { while (frames_processed < budget) {
struct sk_buff *skb; struct sk_buff *skb;
...@@ -1517,6 +1514,12 @@ static int ibmvnic_poll(struct napi_struct *napi, int budget) ...@@ -1517,6 +1514,12 @@ static int ibmvnic_poll(struct napi_struct *napi, int budget)
u16 offset; u16 offset;
u8 flags = 0; 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])) if (!pending_scrq(adapter, adapter->rx_scrq[scrq_num]))
break; break;
next = ibmvnic_next_scrq(adapter, adapter->rx_scrq[scrq_num]); next = ibmvnic_next_scrq(adapter, adapter->rx_scrq[scrq_num]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment