From d445503593190d83620fc4be8208cf0cef8e738e Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jgarzik@pobox.com>
Date: Fri, 4 Nov 2005 22:46:35 -0500
Subject: [PATCH] --- yaml --- r: 15673 b: refs/heads/master c:
 96a71d52bb91d9b386a60f904956420f98946dd3 h: refs/heads/master i:   15671:
 29d6f0135e708c44c2816d3656588ef878a2ae92 v: v3

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

diff --git a/[refs] b/[refs]
index 1acc34acd842..12b6110a554e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38b492a21ac1b0f0a5ebed69c9e2ee6f4202f574
+refs/heads/master: 96a71d52bb91d9b386a60f904956420f98946dd3
diff --git a/trunk/drivers/net/8139too.c b/trunk/drivers/net/8139too.c
index bcea9d41c32c..120baaa90754 100644
--- a/trunk/drivers/net/8139too.c
+++ b/trunk/drivers/net/8139too.c
@@ -1599,7 +1599,7 @@ static void rtl8139_thread (void *_data)
 	struct net_device *dev = _data;
 	struct rtl8139_private *tp = netdev_priv(dev);
 
-	if (rtnl_lock_interruptible() == 0) {
+	if (rtnl_shlock_nowait() == 0) {
 		rtl8139_thread_iter (dev, tp, tp->mmio_addr);
 		rtnl_unlock ();
 	}