e1000e: Use netdev_info instead of pr_info for link messages (c557a4b3) · Commits · 戴 / test

Replace the pr_info calls with netdev_info in all cases related to the netdevice link state. As a result of this patch the link messages will change as shown below. Before: e1000e: ens3 NIC Link is Down e1000e: ens3 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: Rx/Tx After: e1000e 0000:00:03.0 ens3: NIC Link is Down e1000e 0000:00:03.0 ens3: NIC Link is Up 1000 Mbps Full Duplex, Flow Control: Rx/Tx Suggested-by:

Joe Perches <joe@perches.com> Signed-off-by:

Alexander Duyck <alexander.h.duyck@linux.intel.com> Acked-by:

Neil Horman <nhorman@tuxdriver.com> Tested-by:

Aaron Brown <aaron.f.brown@intel.com> Signed-off-by:

Jeff Kirsher <jeffrey.t.kirsher@intel.com>

drivers/net/ethernet/intel/e1000e/netdev.c

+9 −8

Original line number	Diff line number	Diff line
		@@ -4723,7 +4723,7 @@ int e1000e_close(struct net_device *netdev)
		e1000_free_irq(adapter);

		/* Link status message must follow this format */
		pr_info("%s NIC Link is Down\n", netdev->name);
		netdev_info(netdev, "NIC Link is Down\n");
		}

		napi_disable(&adapter->napi);
		@@ -5073,8 +5073,9 @@ static void e1000_print_link_info(struct e1000_adapter *adapter)
		u32 ctrl = er32(CTRL);

		/* Link status message must follow this format for user tools */
		pr_info("%s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n",
		adapter->netdev->name, adapter->link_speed,
		netdev_info(adapter->netdev,
		"NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n",
		adapter->link_speed,
		adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half",
		(ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE) ? "Rx/Tx" :
		(ctrl & E1000_CTRL_RFCE) ? "Rx" :
		@@ -5307,7 +5308,7 @@ static void e1000_watchdog_task(struct work_struct *work)
		adapter->link_speed = 0;
		adapter->link_duplex = 0;
		/* Link status message must follow this format */
		pr_info("%s NIC Link is Down\n", adapter->netdev->name);
		netdev_info(netdev, "NIC Link is Down\n");
		netif_carrier_off(netdev);
		netif_stop_queue(netdev);
		if (!test_bit(__E1000_DOWN, &adapter->state))

Admin message