From aa673b7263fc185656b2b0e201d5d7c1166291f5 Mon Sep 17 00:00:00 2001 From: Greg Rose Date: Sat, 19 Jan 2013 06:40:22 +0000 Subject: [PATCH] --- yaml --- r: 351651 b: refs/heads/master c: b876a744a228308ecf75466831453f0863d253db h: refs/heads/master i: 351649: c7abab4c649532bca6c5bdf29f1a6b9836197125 351647: d4b21d89198c2cbf1e44db35284075bc85f5a46b v: v3 --- [refs] | 2 +- .../net/ethernet/intel/ixgbevf/ixgbevf_main.c | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9d98e21fbe52..cb2791df015b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43dc4e0158a343e4f6dc400b925bf4a945f4978b +refs/heads/master: b876a744a228308ecf75466831453f0863d253db diff --git a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 551e31dc25c5..c3db6cd69b68 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -2245,10 +2245,23 @@ static void ixgbevf_watchdog_task(struct work_struct *work) if (link_up) { if (!netif_carrier_ok(netdev)) { + char *link_speed_string; + switch (link_speed) { + case IXGBE_LINK_SPEED_10GB_FULL: + link_speed_string = "10 Gbps"; + break; + case IXGBE_LINK_SPEED_1GB_FULL: + link_speed_string = "1 Gbps"; + break; + case IXGBE_LINK_SPEED_100_FULL: + link_speed_string = "100 Mbps"; + break; + default: + link_speed_string = "unknown speed"; + break; + } dev_info(&adapter->pdev->dev, - "NIC Link is Up, %u Gbps\n", - (link_speed == IXGBE_LINK_SPEED_10GB_FULL) ? - 10 : 1); + "NIC Link is Up, %s\n", link_speed_string); netif_carrier_on(netdev); netif_tx_wake_all_queues(netdev); }