summaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3/cxgb3_main.c
diff options
context:
space:
mode:
authorDivy Le Ray <divy@chelsio.com>2007-04-10 05:10:22 +0200
committerJeff Garzik <jeff@garzik.org>2007-04-11 17:54:43 +0200
commitf2d961c9827bab4b64a1b4ea30c68cf5ab2b2330 (patch)
tree6e3b2917ff1fa6a2ca726c781792dcb8907f7ab2 /drivers/net/cxgb3/cxgb3_main.c
parentskge: fix wake on lan (diff)
downloadlinux-f2d961c9827bab4b64a1b4ea30c68cf5ab2b2330.tar.xz
linux-f2d961c9827bab4b64a1b4ea30c68cf5ab2b2330.zip
cxgb3 - avoid deadlock with mac watchdog
Fix a deadlock when the interface s configured down and the watchdog tack is sleeping on rtnl_lock. Signed-off-by: Divy Le Ray <divy@chelsio.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to '')
-rw-r--r--drivers/net/cxgb3/cxgb3_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 26240fd5e768..c6ebe25464ca 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -2119,7 +2119,9 @@ static void check_t3b2_mac(struct adapter *adapter)
{
int i;
- rtnl_lock(); /* synchronize with ifdown */
+ if (!rtnl_trylock()) /* synchronize with ifdown */
+ return;
+
for_each_port(adapter, i) {
struct net_device *dev = adapter->port[i];
struct port_info *p = netdev_priv(dev);