projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
692412b
)
cxgb3 - avoid deadlock with mac watchdog
author
Divy Le Ray
<divy@chelsio.com>
Tue, 10 Apr 2007 03:10:22 +0000
(20:10 -0700)
committer
Jeff Garzik
<jeff@garzik.org>
Wed, 11 Apr 2007 15:54:43 +0000
(11:54 -0400)
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>
drivers/net/cxgb3/cxgb3_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/cxgb3/cxgb3_main.c
b/drivers/net/cxgb3/cxgb3_main.c
index
26240fd
..
c6ebe25
100644
(file)
--- 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);