---

yaml --- r: 44302 b: refs/heads/master c: b57bd06 h: refs/heads/master v: v3
git-mirror · Dec 12, 2006 · bd3e537 · bd3e537
1 parent 6b6a6a9
commit bd3e537
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99a3eb3845f034eb55640a3da73e5e28349678c6
+refs/heads/master: b57bd06655a028aba7b92e1c19c2093e7fcfb341
diff --git a/trunk/drivers/net/8139too.c b/trunk/drivers/net/8139too.c
@@ -2131,14 +2131,15 @@ static int rtl8139_poll(struct net_device *dev, int *budget)
 	}
 
 	if (done) {
+		unsigned long flags;
 		/*
 		 * Order is important since data can get interrupted
 		 * again when we think we are done.
 		 */
-		local_irq_disable();
+		local_irq_save(flags);
 		RTL_W16_F(IntrMask, rtl8139_intr_mask);
 		__netif_rx_complete(dev);
-		local_irq_enable();
+		local_irq_restore(flags);
 	}
 	spin_unlock(&tp->rx_lock);