Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b30c4d8f authored by Jeff Kirsher's avatar Jeff Kirsher Committed by David S. Miller
Browse files

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: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a46e534b

drivers/net/e1000/e1000_main.c

+7 −5
Original line number Diff line number Diff line
@@ -2524,8 +2524,9 @@ static void e1000_watchdog(unsigned long data) 
			                           &adapter->link_duplex);



			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",

			       netdev->name,

			       adapter->link_speed,

			       adapter->link_duplex == FULL_DUPLEX ?

			        "Full Duplex" : "Half Duplex",
@@ -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));