From 8a31e73be10f38fd2eeea63faf78d18df54fd73c Mon Sep 17 00:00:00 2001 From: Ron Mercer Date: Tue, 3 Mar 2009 12:10:31 +0000 Subject: [PATCH] --- yaml --- r: 135043 b: refs/heads/master c: 11d9fe68acd8213b50f3a8b5b6a4b66f623a82c3 h: refs/heads/master i: 135041: 9014f4a5b568e8ac96b4a2e17014d6a72c43249c 135039: a1faa895b3f15f122214fdfc7fae0813836cf65c v: v3 --- [refs] | 2 +- trunk/drivers/net/qlge/qlge_mpi.c | 20 ++++++-------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 0b79dcd3be39..adfdb68ebc6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eae6b58fb229bd17fea38d596020b80547e51381 +refs/heads/master: 11d9fe68acd8213b50f3a8b5b6a4b66f623a82c3 diff --git a/trunk/drivers/net/qlge/qlge_mpi.c b/trunk/drivers/net/qlge/qlge_mpi.c index ebb7b0c48dea..5871bc967d88 100644 --- a/trunk/drivers/net/qlge/qlge_mpi.c +++ b/trunk/drivers/net/qlge/qlge_mpi.c @@ -181,23 +181,15 @@ static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp) 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)