mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-19 17:11:03 +00:00
Code Issues Releases Wiki Activity

ixgbe: cleanup link up/down messages

Browse source 
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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jeff Kirsher 2008-11-27 00:22:21 -08:00 committed by David S. Miller
parent 527d47c111
commit a46e534bc7
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/net/ixgbe/ixgbe_main.c
View file

@ -3455,15 +3455,16 @@ 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",
(link_speed == IXGBE_LINK_SPEED_10GB_FULL ? netdev->name,
"10 Gbps" : (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
(link_speed == IXGBE_LINK_SPEED_1GB_FULL ? "10 Gbps" :
"1 Gbps" : "unknown speed")), (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
((FLOW_RX && FLOW_TX) ? "RX/TX" : "1 Gbps" : "unknown speed")),
(FLOW_RX ? "RX" : ((FLOW_RX && FLOW_TX) ? "RX/TX" :
(FLOW_TX ? "TX" : "None")))); (FLOW_RX ? "RX" :
(FLOW_TX ? "TX" : "None"))));
netif_carrier_on(netdev); netif_carrier_on(netdev);
netif_tx_wake_all_queues(netdev); netif_tx_wake_all_queues(netdev);
@ -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);
} }