---

yaml --- r: 87831 b: refs/heads/master c: 6ef2977 h: refs/heads/master i: 87829: 599df70 87827: bb6013b 87823: f9e177d v: v3
git-mirror · Mar 26, 2008 · 231f0bd · 231f0bd
1 parent c9367e2
commit 231f0bd
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: 9f5e60dd5ffca938da4cabc197af8b9405b5512e
+refs/heads/master: 6ef2977d414cc196baba0fb53509c5f8cd9154b4
diff --git 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;