]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
ixgbe: Specific check for 100 Full link speed
authorEmil Tantilov <emil.s.tantilov@intel.com>
Sat, 19 Feb 2011 08:43:39 +0000 (08:43 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 3 Mar 2011 12:17:38 +0000 (04:17 -0800)
This patch specifically checks for 100 Full link speed instead of
assuming we are linked at 100 if not linked at 10G and 1G.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Stephen Ko <stephen.s.ko@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ixgbe/ixgbe_common.c

index 4fa195e88f3e46a5521fb2fbcc1d40f7cfac36b3..a12f7c73e27dbf8183ec28f51a01d392a314a5be 100644 (file)
@@ -2658,10 +2658,13 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
            IXGBE_LINKS_SPEED_10G_82599)
                *speed = IXGBE_LINK_SPEED_10GB_FULL;
        else if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
-                IXGBE_LINKS_SPEED_1G_82599)
+                IXGBE_LINKS_SPEED_1G_82599)
                *speed = IXGBE_LINK_SPEED_1GB_FULL;
-       else
+       else if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
+                IXGBE_LINKS_SPEED_100_82599)
                *speed = IXGBE_LINK_SPEED_100_FULL;
+       else
+               *speed = IXGBE_LINK_SPEED_UNKNOWN;
 
        /* if link is down, zero out the current_mode */
        if (*link_up == false) {