---

yaml --- r: 88002 b: refs/heads/master c: 50fd440 h: refs/heads/master v: v3
git-mirror · Mar 28, 2008 · 90fbafa · 90fbafa
1 parent d89851a
commit 90fbafa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8eeee8b152ae6bbe181518efaf62ba8e9c613693
+refs/heads/master: 50fd4407b8bfbde7c1a0bfe4f24de7df37164342
diff --git a/trunk/include/linux/netdevice.h b/trunk/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);
 }
 
 /**