diff options
author | Divy Le Ray <divy@chelsio.com> | 2007-04-09 23:10:22 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-04-11 11:54:43 -0400 |
commit | f2d961c9827bab4b64a1b4ea30c68cf5ab2b2330 (patch) | |
tree | 6e3b2917ff1fa6a2ca726c781792dcb8907f7ab2 /drivers/net/cxgb3/cxgb3_main.c | |
parent | 692412b31ffb5df00197ea591dd635fc07506c02 (diff) |
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 'drivers/net/cxgb3/cxgb3_main.c')
-rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 26240fd5e76..c6ebe25464c 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) | |||
2119 | { | 2119 | { |
2120 | int i; | 2120 | int i; |
2121 | 2121 | ||
2122 | rtnl_lock(); /* synchronize with ifdown */ | 2122 | if (!rtnl_trylock()) /* synchronize with ifdown */ |
2123 | return; | ||
2124 | |||
2123 | for_each_port(adapter, i) { | 2125 | for_each_port(adapter, i) { |
2124 | struct net_device *dev = adapter->port[i]; | 2126 | struct net_device *dev = adapter->port[i]; |
2125 | struct port_info *p = netdev_priv(dev); | 2127 | struct port_info *p = netdev_priv(dev); |