diff options
author | Song Liu <songliubraving@fb.com> | 2018-10-03 14:30:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-10-03 17:40:32 -0400 |
commit | 4233cfe6ec4683497d7318f55ce7617e97f2e610 (patch) | |
tree | 5a742ed70e661b7a2e166e825a53ff6e24251335 | |
parent | 2cc543f5cd6deda27ef463686fa08c16c8c0990b (diff) |
ixgbe: check return value of napi_complete_done()
The NIC driver should only enable interrupts when napi_complete_done()
returns true. This patch adds the check for ixgbe.
Cc: stable@vger.kernel.org # 4.10+
Suggested-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Song Liu <songliubraving@fb.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index f27d73a7bf16..6cdd58d9d461 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
@@ -3196,11 +3196,13 @@ int ixgbe_poll(struct napi_struct *napi, int budget) | |||
3196 | return budget; | 3196 | return budget; |
3197 | 3197 | ||
3198 | /* all work done, exit the polling mode */ | 3198 | /* all work done, exit the polling mode */ |
3199 | napi_complete_done(napi, work_done); | 3199 | if (likely(napi_complete_done(napi, work_done))) { |
3200 | if (adapter->rx_itr_setting & 1) | 3200 | if (adapter->rx_itr_setting & 1) |
3201 | ixgbe_set_itr(q_vector); | 3201 | ixgbe_set_itr(q_vector); |
3202 | if (!test_bit(__IXGBE_DOWN, &adapter->state)) | 3202 | if (!test_bit(__IXGBE_DOWN, &adapter->state)) |
3203 | ixgbe_irq_enable_queues(adapter, BIT_ULL(q_vector->v_idx)); | 3203 | ixgbe_irq_enable_queues(adapter, |
3204 | BIT_ULL(q_vector->v_idx)); | ||
3205 | } | ||
3204 | 3206 | ||
3205 | return min(work_done, budget - 1); | 3207 | return min(work_done, budget - 1); |
3206 | } | 3208 | } |