diff options
| author |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2008-11-27 00:22:45 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-11-27 00:22:45 -0800 |
| commit | b30c4d8f8210bc4ea92942ab786407ec2d780549 (patch) | |
| tree | e3c376cd94f1b72d23913b696a2412ef77113b5a /drivers/net/e1000 | |
| parent | ixgbe: cleanup link up/down messages (diff) | |
| download | linux-dev-b30c4d8f8210bc4ea92942ab786407ec2d780549.tar.xz linux-dev-b30c4d8f8210bc4ea92942ab786407ec2d780549.zip | |
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.c | 12 |
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) &adapter->link_duplex); ctrl = er32(CTRL); - DPRINTK(LINK, INFO, "NIC Link is Up %d Mbps %s, " - "Flow Control: %s\n", - adapter->link_speed, - adapter->link_duplex == FULL_DUPLEX ? + printk(KERN_INFO "e1000: %s NIC Link is Up %d Mbps %s, " + "Flow Control: %s\n", + netdev->name, + adapter->link_speed, + adapter->link_duplex == FULL_DUPLEX ? "Full Duplex" : "Half Duplex", ((ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE)) ? "RX/TX" : ((ctrl & @@ -2603,7 +2604,8 @@ static void e1000_watchdog(unsigned long data) if (netif_carrier_ok(netdev)) { adapter->link_speed = 0; adapter->link_duplex = 0; - DPRINTK(LINK, INFO, "NIC Link is Down\n"); + printk(KERN_INFO "e1000: %s NIC Link is Down\n", + netdev->name); netif_carrier_off(netdev); netif_stop_queue(netdev); mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ)); |