lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	drivers/net/usb/rndis_host.c
	drivers/net/wireless/b43/dma.c
	net/ipv6/ndisc.c
This commit is contained in:
David S. Miller
2008-03-27 18:48:56 -07:00
parent ed85f2c3b2 50fd4407b8
commit 8e8e43843b
76 changed files with 640 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/netdevice.h
View File

@@ -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);
}
/**