aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2008-11-27 03:22:45 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-27 03:22:45 -0500
commitb30c4d8f8210bc4ea92942ab786407ec2d780549 (patch)
treee3c376cd94f1b72d23913b696a2412ef77113b5a /drivers/net/e1000
parenta46e534bc76ed4e92daa181526b30274d37c6979 (diff)
e1000: cleanup link up/down messages
The system log messages created on a link status change need to follow a specific format to work with tools some customers use. This also makes the messages consistant with other Intel driver link messages. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 5c098c9d584e..6494d245d156 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2524,10 +2524,11 @@ static void e1000_watchdog(unsigned long data)
2524 &adapter->link_duplex); 2524 &adapter->link_duplex);
2525 2525
2526 ctrl = er32(CTRL); 2526 ctrl = er32(CTRL);
2527 DPRINTK(LINK, INFO, "NIC Link is Up %d Mbps %s, " 2527 printk(KERN_INFO "e1000: %s NIC Link is Up %d Mbps %s, "
2528 "Flow Control: %s\n", 2528 "Flow Control: %s\n",
2529 adapter->link_speed, 2529 netdev->name,
2530 adapter->link_duplex == FULL_DUPLEX ? 2530 adapter->link_speed,
2531 adapter->link_duplex == FULL_DUPLEX ?
2531 "Full Duplex" : "Half Duplex", 2532 "Full Duplex" : "Half Duplex",
2532 ((ctrl & E1000_CTRL_TFCE) && (ctrl & 2533 ((ctrl & E1000_CTRL_TFCE) && (ctrl &
2533 E1000_CTRL_RFCE)) ? "RX/TX" : ((ctrl & 2534 E1000_CTRL_RFCE)) ? "RX/TX" : ((ctrl &
@@ -2603,7 +2604,8 @@ static void e1000_watchdog(unsigned long data)
2603 if (netif_carrier_ok(netdev)) { 2604 if (netif_carrier_ok(netdev)) {
2604 adapter->link_speed = 0; 2605 adapter->link_speed = 0;
2605 adapter->link_duplex = 0; 2606 adapter->link_duplex = 0;
2606 DPRINTK(LINK, INFO, "NIC Link is Down\n"); 2607 printk(KERN_INFO "e1000: %s NIC Link is Down\n",
2608 netdev->name);
2607 netif_carrier_off(netdev); 2609 netif_carrier_off(netdev);
2608 netif_stop_queue(netdev); 2610 netif_stop_queue(netdev);
2609 mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ)); 2611 mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ));