From bd3e5378dfb59b1637f8fc305f13dd332f433730 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 12 Dec 2006 13:49:35 +0100
Subject: [PATCH] --- yaml --- r: 44302 b: refs/heads/master c:
 b57bd06655a028aba7b92e1c19c2093e7fcfb341 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/8139too.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b71989317455..25c3f8185c5a 100644
--- 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
index 931028f672de..35ad5cff18e6 100644
--- 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);