1 files changed, 7 insertions, 0 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 47e731528315..b60c26b7d31c 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -322,6 +322,7 @@ enum
 {
         NAPI_STATE_SCHED,       /* Poll is scheduled */
         NAPI_STATE_DISABLE,     /* Disable pending */
+        NAPI_STATE_NPSVC,       /* Netpoll - don't dequeue from poll_list */
 };
 
 extern void __napi_schedule(struct napi_struct *n);
@@ -1622,6 +1623,12 @@ static inline void netif_rx_complete(struct net_device *dev,
 {
         unsigned long flags;
 
+        /*
+         * don't let napi dequeue from the cpu poll list
+         * just in case its running on a different cpu
+         */
+        if (unlikely(test_bit(NAPI_STATE_NPSVC, &napi->state)))
+                return;
         local_irq_save(flags);
         __netif_rx_complete(dev, napi);
         local_irq_restore(flags);