[<prev] [next>] [day] [month] [year] [list]
Message-Id: <200803282141.m2SLfRhN011846@imap1.linux-foundation.org>
Date: Fri, 28 Mar 2008 14:41:27 -0700
From: akpm@...ux-foundation.org
To: jeff@...zik.org
Cc: netdev@...r.kernel.org, akpm@...ux-foundation.org,
dwalker@...sta.com, raisch@...ibm.com, themann@...ibm.com,
tklein@...ibm.com
Subject: [patch 16/21] netdev: ehea: locking order correction
From: Daniel Walker <dwalker@...sta.com>
Nested locks always need to be taken in the same order. This change factors
out the ehea_fw_handles.lock to make the locking order consistent.
Signed-off-by: Daniel Walker <dwalker@...sta.com>
Cc: Jeff Garzik <jeff@...zik.org>
Cc: Christoph Raisch <raisch@...ibm.com>
Cc: Jan-Bernd Themann <themann@...ibm.com>
Cc: Thomas Klein <tklein@...ibm.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
drivers/net/ehea/ehea_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/net/ehea/ehea_main.c~net-ehea-locking-order-correction drivers/net/ehea/ehea_main.c
--- a/drivers/net/ehea/ehea_main.c~net-ehea-locking-order-correction
+++ a/drivers/net/ehea/ehea_main.c
@@ -2567,14 +2567,14 @@ static int ehea_down(struct net_device *
if (port->state == EHEA_PORT_DOWN)
return 0;
+ mutex_lock(&ehea_fw_handles.lock);
+
down(&ehea_bcmc_regs.lock);
ehea_drop_multicast_list(dev);
ehea_broadcast_reg_helper(port, H_DEREG_BCMC);
ehea_free_interrupts(dev);
- mutex_lock(&ehea_fw_handles.lock);
-
port->state = EHEA_PORT_DOWN;
ehea_update_bcmc_registrations();
_
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists