diff options
| author | Ron Mercer <ron.mercer@qlogic.com> | 2010-12-11 12:06:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-13 00:02:57 +0100 |
| commit | 4d7b6b5d247aa71ea27709b9eac1ba6e752fbe87 (patch) | |
| tree | 0af7a055a47899bd8a6475e182628b5fb1daa5b2 /drivers/net/qlge/qlge.h | |
| parent | Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst... (diff) | |
| download | linux-4d7b6b5d247aa71ea27709b9eac1ba6e752fbe87.tar.xz linux-4d7b6b5d247aa71ea27709b9eac1ba6e752fbe87.zip | |
qlge: Fix deadlock when cancelling worker.
Removing usage of rtnl_lock() to protect firmware interface registers.
These registers are accessed in some worker threads and can create a
deadlock if rtnl_lock is taken by upper layers while the worker is still
pending.
We remove rtnl_lock and use a driver mutex just while mailboxes are
accessed.
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlge/qlge.h')
| -rw-r--r-- | drivers/net/qlge/qlge.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h index 22821398fc63..9787dff90d3f 100644 --- a/drivers/net/qlge/qlge.h +++ b/drivers/net/qlge/qlge.h @@ -2083,6 +2083,7 @@ struct ql_adapter { u32 mailbox_in; u32 mailbox_out; struct mbox_params idc_mbc; + struct mutex mpi_mutex; int tx_ring_size; int rx_ring_size; |