diff options
| author | Ron Mercer <ron.mercer@qlogic.com> | 2009-03-03 12:10:32 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-03 23:50:46 -0800 |
| commit | 5700abe94794cd548d9cb8bfb7e00eb7a8bedb60 (patch) | |
| tree | d6967fae935db278f8a15cc45a85dbacf0c4f9ea /drivers/net/qlge/qlge_mpi.c | |
| parent | 11d9fe68acd8213b50f3a8b5b6a4b66f623a82c3 (diff) | |
| download | kernel_samsung_crespo-5700abe94794cd548d9cb8bfb7e00eb7a8bedb60.zip kernel_samsung_crespo-5700abe94794cd548d9cb8bfb7e00eb7a8bedb60.tar.gz kernel_samsung_crespo-5700abe94794cd548d9cb8bfb7e00eb7a8bedb60.tar.bz2 | |
qlge: Clean up link up 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 | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/qlge/qlge_mpi.c index 5871bc9..3b4b494 100644 --- a/drivers/net/qlge/qlge_mpi.c +++ b/drivers/net/qlge/qlge_mpi.c @@ -159,24 +159,23 @@ static int ql_idc_cmplt_aen(struct ql_adapter *qdev) return status; } + static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp) { + int status; mbcp->out_count = 2; - if (ql_get_mb_sts(qdev, mbcp)) - goto exit; + status = ql_get_mb_sts(qdev, mbcp); + if (status) { + QPRINTK(qdev, DRV, ERR, + "%s: Could not get mailbox status.\n", __func__); + return; + } qdev->link_status = mbcp->mbox_out[1]; QPRINTK(qdev, DRV, ERR, "Link Up.\n"); - QPRINTK(qdev, DRV, INFO, "Link Status = 0x%.08x.\n", mbcp->mbox_out[1]); - if (!netif_carrier_ok(qdev->ndev)) { - QPRINTK(qdev, LINK, INFO, "Link is Up.\n"); - netif_carrier_on(qdev->ndev); - netif_wake_queue(qdev->ndev); - } -exit: - /* Clear the MPI firmware status. */ - ql_write32(qdev, CSR, CSR_CMD_CLR_R2PCI_INT); + + netif_carrier_on(qdev->ndev); } static void ql_link_down(struct ql_adapter *qdev, struct mbox_params *mbcp) |