diff options
| author |   Ron Mercer <ron.mercer@qlogic.com> | 2009-03-03 12:10:31 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-03-03 23:50:46 -0800 |
| commit | 11d9fe68acd8213b50f3a8b5b6a4b66f623a82c3 (patch) | |
| tree | 2de9c31389daf5e299eda45e0bfc01df91c86b5a /drivers/net/qlge/qlge_mpi.c | |
| parent | qlge: Add firmware support for insert/remove SFP. (diff) | |
| download | linux-dev-11d9fe68acd8213b50f3a8b5b6a4b66f623a82c3.tar.xz linux-dev-11d9fe68acd8213b50f3a8b5b6a4b66f623a82c3.zip | |
qlge: Clean up link down processing.
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_mpi.c')
| -rw-r--r-- | drivers/net/qlge/qlge_mpi.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/qlge/qlge_mpi.c index ebb7b0c48dea..5871bc967d88 100644 --- a/drivers/net/qlge/qlge_mpi.c +++ b/drivers/net/qlge/qlge_mpi.c @@ -181,23 +181,15 @@ exit: static void ql_link_down(struct ql_adapter *qdev, struct mbox_params *mbcp) { + int status; + mbcp->out_count = 3; - if (ql_get_mb_sts(qdev, mbcp)) { - QPRINTK(qdev, DRV, ERR, "Firmware did not initialize!\n"); - goto exit; - } + status = ql_get_mb_sts(qdev, mbcp); + if (status) + QPRINTK(qdev, DRV, ERR, "Link down AEN broken!\n"); - if (netif_carrier_ok(qdev->ndev)) { - QPRINTK(qdev, LINK, INFO, "Link is Down.\n"); - netif_carrier_off(qdev->ndev); - netif_stop_queue(qdev->ndev); - } - QPRINTK(qdev, DRV, ERR, "Link Down.\n"); - QPRINTK(qdev, DRV, ERR, "Link Status = 0x%.08x.\n", mbcp->mbox_out[1]); -exit: - /* Clear the MPI firmware status. */ - ql_write32(qdev, CSR, CSR_CMD_CLR_R2PCI_INT); + netif_carrier_off(qdev->ndev); } static int ql_sfp_in(struct ql_adapter *qdev, struct mbox_params *mbcp) |