diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-18 11:06:12 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-18 11:06:12 +1100 |
| commit | c280266a326ccabeb64b6d69fa4fd21faf5bf354 (patch) | |
| tree | f8a89e593a0ba43b75bb666d8e245b2460dc0d40 /include/linux/netdevice.h | |
| parent | eddce368f99b682683e09cf206eaa25131d40abe (diff) | |
| parent | 55dac3a5553b13891f0ae4bbd11920619b5436d4 (diff) | |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 9d77b1d7dca..e26f5495289 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -319,6 +319,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); @@ -1497,6 +1498,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); |