aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/netdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r--drivers/net/e1000e/netdev.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 7eb1a3603db9..cd6d132160c0 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -3408,7 +3408,10 @@ static void e1000_print_link_info(struct e1000_adapter *adapter)
3408 struct e1000_hw *hw = &adapter->hw; 3408 struct e1000_hw *hw = &adapter->hw;
3409 u32 ctrl = er32(CTRL); 3409 u32 ctrl = er32(CTRL);
3410 3410
3411 e_info("Link is Up %d Mbps %s, Flow Control: %s\n", 3411 /* Link status message must follow this format for user tools */
3412 printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s, "
3413 "Flow Control: %s\n",
3414 adapter->netdev->name,
3412 adapter->link_speed, 3415 adapter->link_speed,
3413 (adapter->link_duplex == FULL_DUPLEX) ? 3416 (adapter->link_duplex == FULL_DUPLEX) ?
3414 "Full Duplex" : "Half Duplex", 3417 "Full Duplex" : "Half Duplex",
@@ -3618,7 +3621,9 @@ static void e1000_watchdog_task(struct work_struct *work)
3618 if (netif_carrier_ok(netdev)) { 3621 if (netif_carrier_ok(netdev)) {
3619 adapter->link_speed = 0; 3622 adapter->link_speed = 0;
3620 adapter->link_duplex = 0; 3623 adapter->link_duplex = 0;
3621 e_info("Link is Down\n"); 3624 /* Link status message must follow this format */
3625 printk(KERN_INFO "e1000e: %s NIC Link is Down\n",
3626 adapter->netdev->name);
3622 netif_carrier_off(netdev); 3627 netif_carrier_off(netdev);
3623 netif_tx_stop_all_queues(netdev); 3628 netif_tx_stop_all_queues(netdev);
3624 if (!test_bit(__E1000_DOWN, &adapter->state)) 3629 if (!test_bit(__E1000_DOWN, &adapter->state))