diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-27 18:48:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-27 18:48:56 -0700 |
| commit | 8e8e43843ba3ced0c657cbc0fdb10644ec60f772 (patch) | |
| tree | e64954326ced9c365c52c256f01b5f9fb1bcae66 /include/linux/netdevice.h | |
| parent | ed85f2c3b2b72bd20f617ac749f5c22be8d0f66e (diff) | |
| parent | 50fd4407b8bfbde7c1a0bfe4f24de7df37164342 (diff) | |
| download | kernel-crypto-8e8e43843ba3ced0c657cbc0fdb10644ec60f772.tar.gz kernel-crypto-8e8e43843ba3ced0c657cbc0fdb10644ec60f772.tar.xz kernel-crypto-8e8e43843ba3ced0c657cbc0fdb10644ec60f772.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/usb/rndis_host.c
drivers/net/wireless/b43/dma.c
net/ipv6/ndisc.c
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 15fa84a15c2..3b54f8a2c05 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -383,9 +383,11 @@ static inline void __napi_complete(struct napi_struct *n) static inline void napi_complete(struct napi_struct *n) { - local_irq_disable(); + unsigned long flags; + + local_irq_save(flags); __napi_complete(n); - local_irq_enable(); + local_irq_restore(flags); } /** |