From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964873AbXDJDK1 (ORCPT ); Mon, 9 Apr 2007 23:10:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932950AbXDJDK0 (ORCPT ); Mon, 9 Apr 2007 23:10:26 -0400 Received: from stargate.chelsio.com ([12.22.49.110]:24160 "EHLO stargate.chelsio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932933AbXDJDKY (ORCPT ); Mon, 9 Apr 2007 23:10:24 -0400 From: divy@chelsio.com Subject: [PATCH 2.6.21 1/3] cxgb3 - avoid deadlock with mac watchdog To: jeff@garzik.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, swise@opengridcomputing.com Date: Mon, 09 Apr 2007 20:10:22 -0700 Message-ID: <20070410031022.12878.81342.stgit@localhost.localdomain> User-Agent: StGIT/0.12 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Divy Le Ray Fix a deadlock when the interface s configured down and the watchdog tack is sleeping on rtnl_lock. Signed-off-by: Divy Le Ray --- 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 26240fd..c6ebe25 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 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);