The patch titled
cxgb3: avoid deadlock with mac watchdog
has been added to the -mm tree. Its filename is
cxgb3-avoid-deadlock-with-mac-watchdog.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: cxgb3: avoid deadlock with mac watchdog
From: Divy Le Ray <divy@xxxxxxxxxxx>
Fix a deadlock when the interface s configured down and the watchdog task is
sleeping on rtnl_lock.
Signed-off-by: Divy Le Ray <divy@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/cxgb3/cxgb3_main.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
diff -puN drivers/net/cxgb3/cxgb3_main.c~cxgb3-avoid-deadlock-with-mac-watchdog drivers/net/cxgb3/cxgb3_main.c
--- a/drivers/net/cxgb3/cxgb3_main.c~cxgb3-avoid-deadlock-with-mac-watchdog
+++ a/drivers/net/cxgb3/cxgb3_main.c
@@ -2119,7 +2119,9 @@ static void check_t3b2_mac(struct adapte
{
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);
_
Patches currently in -mm which might be from divy@xxxxxxxxxxx are
cxgb3-avoid-deadlock-with-mac-watchdog.patch
cxgb3-mac-watchdog-update.patch
cxgb3-missing-cpl-handler-and-register-setting.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
