diff options
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 7e1cc6efc64c..39869f90bdc9 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -3455,15 +3455,16 @@ static void ixgbe_watchdog_task(struct work_struct *work) | |||
3455 | u32 rmcs = IXGBE_READ_REG(hw, IXGBE_RMCS); | 3455 | u32 rmcs = IXGBE_READ_REG(hw, IXGBE_RMCS); |
3456 | #define FLOW_RX (frctl & IXGBE_FCTRL_RFCE) | 3456 | #define FLOW_RX (frctl & IXGBE_FCTRL_RFCE) |
3457 | #define FLOW_TX (rmcs & IXGBE_RMCS_TFCE_802_3X) | 3457 | #define FLOW_TX (rmcs & IXGBE_RMCS_TFCE_802_3X) |
3458 | DPRINTK(LINK, INFO, "NIC Link is Up %s, " | 3458 | printk(KERN_INFO "ixgbe: %s NIC Link is Up %s, " |
3459 | "Flow Control: %s\n", | 3459 | "Flow Control: %s\n", |
3460 | (link_speed == IXGBE_LINK_SPEED_10GB_FULL ? | 3460 | netdev->name, |
3461 | "10 Gbps" : | 3461 | (link_speed == IXGBE_LINK_SPEED_10GB_FULL ? |
3462 | (link_speed == IXGBE_LINK_SPEED_1GB_FULL ? | 3462 | "10 Gbps" : |
3463 | "1 Gbps" : "unknown speed")), | 3463 | (link_speed == IXGBE_LINK_SPEED_1GB_FULL ? |
3464 | ((FLOW_RX && FLOW_TX) ? "RX/TX" : | 3464 | "1 Gbps" : "unknown speed")), |
3465 | (FLOW_RX ? "RX" : | 3465 | ((FLOW_RX && FLOW_TX) ? "RX/TX" : |
3466 | (FLOW_TX ? "TX" : "None")))); | 3466 | (FLOW_RX ? "RX" : |
3467 | (FLOW_TX ? "TX" : "None")))); | ||
3467 | 3468 | ||
3468 | netif_carrier_on(netdev); | 3469 | netif_carrier_on(netdev); |
3469 | netif_tx_wake_all_queues(netdev); | 3470 | netif_tx_wake_all_queues(netdev); |
@@ -3475,7 +3476,8 @@ static void ixgbe_watchdog_task(struct work_struct *work) | |||
3475 | adapter->link_up = false; | 3476 | adapter->link_up = false; |
3476 | adapter->link_speed = 0; | 3477 | adapter->link_speed = 0; |
3477 | if (netif_carrier_ok(netdev)) { | 3478 | if (netif_carrier_ok(netdev)) { |
3478 | DPRINTK(LINK, INFO, "NIC Link is Down\n"); | 3479 | printk(KERN_INFO "ixgbe: %s NIC Link is Down\n", |
3480 | netdev->name); | ||
3479 | netif_carrier_off(netdev); | 3481 | netif_carrier_off(netdev); |
3480 | netif_tx_stop_all_queues(netdev); | 3482 | netif_tx_stop_all_queues(netdev); |
3481 | } | 3483 | } |