Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
net
/
ethernet
/
intel
/
ixgbe
/
ixgbe_main.c
diff --git
a/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
b/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index
aed8d02
..
cd9b284
100644
(file)
--- a/
kernel/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/
kernel/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@
-2786,7
+2786,8
@@
int ixgbe_poll(struct napi_struct *napi, int budget)
ixgbe_for_each_ring(ring, q_vector->tx)
clean_complete &= !!ixgbe_clean_tx_irq(q_vector, ring);
ixgbe_for_each_ring(ring, q_vector->tx)
clean_complete &= !!ixgbe_clean_tx_irq(q_vector, ring);
- if (!ixgbe_qv_lock_napi(q_vector))
+ /* Exit if we are called by netpoll or busy polling is active */
+ if ((budget <= 0) || !ixgbe_qv_lock_napi(q_vector))
return budget;
/* attempt to distribute budget to each queue fairly, but don't allow
return budget;
/* attempt to distribute budget to each queue fairly, but don't allow