From 231f0bd9a811101354573fd1182d13c08532123d Mon Sep 17 00:00:00 2001
From: Marin Mitov <mitov@issp.bas.bg>
Date: Sun, 23 Mar 2008 10:20:09 +0200
Subject: [PATCH] --- yaml --- r: 87831 b: refs/heads/master c:
 6ef2977d414cc196baba0fb53509c5f8cd9154b4 h: refs/heads/master i:   87829:
 599df7091edf2c2e407599ad63f503ad656f8af7   87827:
 bb6013b2e08939aafc7f2f2cea08fa0962067541   87823:
 f9e177d6b4a3ae600e8b687773c78d3a56a8e226 v: v3

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

diff --git a/[refs] b/[refs]
index ed6b8f6650f4..8bb40f5c41e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f5e60dd5ffca938da4cabc197af8b9405b5512e
+refs/heads/master: 6ef2977d414cc196baba0fb53509c5f8cd9154b4
diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c
index 186eb8ebfda6..ae52cba75f9a 100644
--- a/trunk/drivers/net/skge.c
+++ b/trunk/drivers/net/skge.c
@@ -3199,12 +3199,14 @@ static int skge_poll(struct napi_struct *napi, int to_do)
 	skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR), CSR_START);
 
 	if (work_done < to_do) {
-		spin_lock_irq(&hw->hw_lock);
+		unsigned long flags;
+		
+		spin_lock_irqsave(&hw->hw_lock, flags);
 		__netif_rx_complete(dev, napi);
 		hw->intr_mask |= napimask[skge->port];
 		skge_write32(hw, B0_IMSK, hw->intr_mask);
 		skge_read32(hw, B0_IMSK);
-		spin_unlock_irq(&hw->hw_lock);
+		spin_unlock_irqrestore(&hw->hw_lock, flags);
 	}
 
 	return work_done;