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

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

ixgbe: 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 527d47c1

drivers/net/ixgbe/ixgbe_main.c

+12 −10
Original line number Original line Diff line number Diff line
@@ -3455,8 +3455,9 @@ static void ixgbe_watchdog_task(struct work_struct *work) 
			u32 rmcs = IXGBE_READ_REG(hw, IXGBE_RMCS);

			u32 rmcs = IXGBE_READ_REG(hw, IXGBE_RMCS);

#define FLOW_RX (frctl & IXGBE_FCTRL_RFCE)

#define FLOW_RX (frctl & IXGBE_FCTRL_RFCE)

#define FLOW_TX (rmcs & IXGBE_RMCS_TFCE_802_3X)

#define FLOW_TX (rmcs & IXGBE_RMCS_TFCE_802_3X)

			DPRINTK(LINK, INFO, "NIC Link is Up %s, "

			printk(KERN_INFO "ixgbe: %s NIC Link is Up %s, "

			       "Flow Control: %s\n",

			       "Flow Control: %s\n",

			       netdev->name,

			       (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?

			       (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?

			        "10 Gbps" :

			        "10 Gbps" :

			        (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?

			        (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
@@ -3475,7 +3476,8 @@ static void ixgbe_watchdog_task(struct work_struct *work) 
		adapter->link_up = false;

		adapter->link_up = false;

		adapter->link_speed = 0;

		adapter->link_speed = 0;

		if (netif_carrier_ok(netdev)) {

		if (netif_carrier_ok(netdev)) {

			DPRINTK(LINK, INFO, "NIC Link is Down\n");

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

			       netdev->name);

			netif_carrier_off(netdev);

			netif_carrier_off(netdev);

			netif_tx_stop_all_queues(netdev);

			netif_tx_stop_all_queues(netdev);

		}

		}