From: Jeff Garzik <jgarzik@pobox.com>
Date: Sat, 5 Nov 2005 03:46:35 +0000 (-0500)
Subject: [netdrvr 8139too] use rtnl_shlock_nowait() rather than rtnl_lock_interruptible()
X-Git-Tag: v2.6.16-rc1~474^2~22^2~7^2~99^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=96a71d52bb91d9b386a60f904956420f98946dd3;p=linux-2.6-omap-h63xx.git

[netdrvr 8139too] use rtnl_shlock_nowait() rather than rtnl_lock_interruptible()
---

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index bcea9d41c32..120baaa9075 100644
--- a/drivers/net/8139too.c
+++ b/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 ();
 	}