diff options
| author | Breno Leitao <leitao@linux.vnet.ibm.com> | 2010-07-01 03:00:18 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-02 21:59:06 -0700 |
| commit | 7ae80abdba0644e12ac17da567a2db1efc1bf8a8 (patch) | |
| tree | f7e71b7a6c0383e982e02c0b74adb16f36263006 /drivers/net/qlge | |
| parent | 72046d84f0d6e3047f4d5a5173260141983b2b61 (diff) | |
qlge: fix a eeh handler to not add a pending timer
On some ocasions the function qlge_io_resume() tries to add a
pending timer, which causes the system to hit the BUG() on
add_timer() function.
This patch removes the timer during the EEH recovery.
Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlge')
| -rw-r--r-- | drivers/net/qlge/qlge_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 509dadcd1c5a..d10bcefc0e45 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c @@ -4712,6 +4712,8 @@ static void ql_eeh_close(struct net_device *ndev) netif_stop_queue(ndev); } + /* Disabling the timer */ + del_timer_sync(&qdev->timer); if (test_bit(QL_ADAPTER_UP, &qdev->flags)) cancel_delayed_work_sync(&qdev->asic_reset_work); cancel_delayed_work_sync(&qdev->mpi_reset_work); |