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

Commit 8f12fe86 authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

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: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 75eb0fad

drivers/net/e1000e/netdev.c

+7 −2
Original line number Diff line number Diff line
@@ -3408,7 +3408,10 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) 
	struct e1000_hw *hw = &adapter->hw;

	u32 ctrl = er32(CTRL);



	e_info("Link is Up %d Mbps %s, Flow Control: %s\n",

	/* Link status message must follow this format for user tools */

	printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s, "

	       "Flow Control: %s\n",

	       adapter->netdev->name,

	       adapter->link_speed,

	       (adapter->link_duplex == FULL_DUPLEX) ?

	                        "Full Duplex" : "Half Duplex",
@@ -3618,7 +3621,9 @@ static void e1000_watchdog_task(struct work_struct *work) 
		if (netif_carrier_ok(netdev)) {

			adapter->link_speed = 0;

			adapter->link_duplex = 0;

			e_info("Link is Down\n");

			/* Link status message must follow this format */

			printk(KERN_INFO "e1000e: %s NIC Link is Down\n",

			       adapter->netdev->name);

			netif_carrier_off(netdev);

			netif_tx_stop_all_queues(netdev);

			if (!test_bit(__E1000_DOWN, &adapter->state))