ixgbevf: Fix link speed message to support 100Mbps
authorGreg Rose <gregory.v.rose@intel.com>
Sat, 19 Jan 2013 06:40:22 +0000 (06:40 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 23 Jan 2013 22:34:13 +0000 (14:34 -0800)
The X540 can link at 100Mbps - fix the link speed indicator message to
show that value.

Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

index 551e31dc25c50123950e2d838f29640a39353448..c3db6cd69b68b0135f42908fd738bd7c9fd4fddc 100644 (file)
@@ -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);
                }