提交 b30c4d8f 编写于 作者: J Jeff Kirsher 提交者: David S. Miller

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: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 a46e534b
...@@ -2524,10 +2524,11 @@ static void e1000_watchdog(unsigned long data) ...@@ -2524,10 +2524,11 @@ static void e1000_watchdog(unsigned long data)
&adapter->link_duplex); &adapter->link_duplex);
ctrl = er32(CTRL); ctrl = er32(CTRL);
DPRINTK(LINK, INFO, "NIC Link is Up %d Mbps %s, " printk(KERN_INFO "e1000: %s NIC Link is Up %d Mbps %s, "
"Flow Control: %s\n", "Flow Control: %s\n",
adapter->link_speed, netdev->name,
adapter->link_duplex == FULL_DUPLEX ? adapter->link_speed,
adapter->link_duplex == FULL_DUPLEX ?
"Full Duplex" : "Half Duplex", "Full Duplex" : "Half Duplex",
((ctrl & E1000_CTRL_TFCE) && (ctrl & ((ctrl & E1000_CTRL_TFCE) && (ctrl &
E1000_CTRL_RFCE)) ? "RX/TX" : ((ctrl & E1000_CTRL_RFCE)) ? "RX/TX" : ((ctrl &
...@@ -2603,7 +2604,8 @@ static void e1000_watchdog(unsigned long data) ...@@ -2603,7 +2604,8 @@ static void e1000_watchdog(unsigned long data)
if (netif_carrier_ok(netdev)) { if (netif_carrier_ok(netdev)) {
adapter->link_speed = 0; adapter->link_speed = 0;
adapter->link_duplex = 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_carrier_off(netdev);
netif_stop_queue(netdev); netif_stop_queue(netdev);
mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ)); mod_timer(&adapter->phy_info_timer, round_jiffies(jiffies + 2 * HZ));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册