diff options
| author | Daniel Walker <dwalker@mvista.com> | 2008-03-29 00:41:27 +0300 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2008-03-29 05:14:33 +0300 |
| commit | dbbcbb2d95dc4faa3b96d39f78032c85e8745c0c (patch) | |
| tree | 887c16fff0805fcb9f4dbb977cc81213726867f1 /drivers/net/ehea | |
| parent | 9f71a568f5f1d6c9fb3ca89b6b973475e6475192 (diff) | |
| download | linux-dbbcbb2d95dc4faa3b96d39f78032c85e8745c0c.tar.xz | |
netdev: ehea: locking order correction
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@mvista.com>
Cc: Christoph Raisch <raisch@de.ibm.com>
Cc: Jan-Bernd Themann <themann@de.ibm.com>
Cc: Thomas Klein <tklein@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/ehea')
| -rw-r--r-- | drivers/net/ehea/ehea_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index 4ae65e876487..0cfc7e2ce395 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c @@ -2567,14 +2567,14 @@ static int ehea_down(struct net_device *dev) 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(); |