aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRon Mercer <ron.mercer@qlogic.com>2009-07-02 02:06:08 -0400
committerDavid S. Miller <davem@davemloft.net>2009-07-03 22:10:26 -0400
commit8b007de19026e91991ae70ca0def31c42435e008 (patch)
tree90826a6d96f9a2321e6089532a4522bbde131693 /drivers
parenta5f59dc926844bf95be2261c1bb0a24597b7a8c5 (diff)
qlge: Fix carrier on condition.
We were turning on the carrier without verifying the link was up. This adds link up to the link initialize check before turning carrier on. Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/qlge/qlge_main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 1da831e99422..c226257dc432 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -3343,7 +3343,11 @@ static int ql_adapter_up(struct ql_adapter *qdev)
3343 } 3343 }
3344 set_bit(QL_ADAPTER_UP, &qdev->flags); 3344 set_bit(QL_ADAPTER_UP, &qdev->flags);
3345 ql_alloc_rx_buffers(qdev); 3345 ql_alloc_rx_buffers(qdev);
3346 if ((ql_read32(qdev, STS) & qdev->port_init)) 3346 /* If the port is initialized and the
3347 * link is up the turn on the carrier.
3348 */
3349 if ((ql_read32(qdev, STS) & qdev->port_init) &&
3350 (ql_read32(qdev, STS) & qdev->port_link_up))
3347 netif_carrier_on(qdev->ndev); 3351 netif_carrier_on(qdev->ndev);
3348 ql_enable_interrupts(qdev); 3352 ql_enable_interrupts(qdev);
3349 ql_enable_all_completion_interrupts(qdev); 3353 ql_enable_all_completion_interrupts(qdev);