From 56f18bed662179f3eff2fb31618468ae594ffdde Mon Sep 17 00:00:00 2001
From: Tobias Diedrich <ranma+kernel@tdiedrich.de>
Date: Thu, 3 Jul 2008 23:54:56 -0700
Subject: [PATCH] --- yaml --- r: 98761 b: refs/heads/master c:
 97bff0953dd45a633fa69e1a650d612f5610a60b h: refs/heads/master i:   98759:
 30e51f903b2f6f47c85350e9a58c64caad89e52a v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/net/forcedeth.c | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 34a8b9273914..dfd6571fc3bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54364b752ef0c91fe92684df000cc4593d1e8963
+refs/heads/master: 97bff0953dd45a633fa69e1a650d612f5610a60b
diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c
index 2cb244763292..20d4fe96a81c 100644
--- a/trunk/drivers/net/forcedeth.c
+++ b/trunk/drivers/net/forcedeth.c
@@ -4194,12 +4194,23 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 
 	netif_carrier_off(dev);
 	if (netif_running(dev)) {
+		unsigned long flags;
+
 		nv_disable_irq(dev);
 		netif_tx_lock_bh(dev);
-		spin_lock(&np->lock);
+		/* with plain spinlock lockdep complains */
+		spin_lock_irqsave(&np->lock, flags);
 		/* stop engines */
+		/* FIXME:
+		 * this can take some time, and interrupts are disabled
+		 * due to spin_lock_irqsave, but let's hope no daemon
+		 * is going to change the settings very often...
+		 * Worst case:
+		 * NV_RXSTOP_DELAY1MAX + NV_TXSTOP_DELAY1MAX
+		 * + some minor delays, which is up to a second approximately
+		 */
 		nv_stop_rxtx(dev);
-		spin_unlock(&np->lock);
+		spin_unlock_irqrestore(&np->lock, flags);
 		netif_tx_unlock_bh(dev);
 	}