diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2008-11-21 19:54:43 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-21 19:54:43 -0500 |
commit | 8f12fe8653eb699a6bc4f88f1a80312466ea2b0e (patch) | |
tree | 0d7449825c12589a428c2f6ccc00b9c6b915543c | |
parent | 75eb0fad56da8494b43865097f362633debdc958 (diff) |
e1000e: link up/down messages must follow a specific format
The system log messages created on a link status change need to follow a
specific format to work with tools some customers use.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/e1000e/netdev.c | 9 |
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)) |