aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe
diff options
context:
space:
mode:
authorEmil Tantilov <emil.s.tantilov@intel.com>2011-02-19 03:43:39 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-03-03 07:17:38 -0500
commit63d778df6d817ea69cadd701abbfa1c491623b50 (patch)
tree55dafab3fcc0ecd37b056a6043fddf42d0e4b8f5 /drivers/net/ixgbe
parent79d5892521144d455114e4820eb30fec802b9c39 (diff)
ixgbe: Specific check for 100 Full link speed
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>
Diffstat (limited to 'drivers/net/ixgbe')
-rw-r--r--drivers/net/ixgbe/ixgbe_common.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index 4fa195e88f3e..a12f7c73e27d 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -2658,10 +2658,13 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
2658 IXGBE_LINKS_SPEED_10G_82599) 2658 IXGBE_LINKS_SPEED_10G_82599)
2659 *speed = IXGBE_LINK_SPEED_10GB_FULL; 2659 *speed = IXGBE_LINK_SPEED_10GB_FULL;
2660 else if ((links_reg & IXGBE_LINKS_SPEED_82599) == 2660 else if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
2661 IXGBE_LINKS_SPEED_1G_82599) 2661 IXGBE_LINKS_SPEED_1G_82599)
2662 *speed = IXGBE_LINK_SPEED_1GB_FULL; 2662 *speed = IXGBE_LINK_SPEED_1GB_FULL;
2663 else 2663 else if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
2664 IXGBE_LINKS_SPEED_100_82599)
2664 *speed = IXGBE_LINK_SPEED_100_FULL; 2665 *speed = IXGBE_LINK_SPEED_100_FULL;
2666 else
2667 *speed = IXGBE_LINK_SPEED_UNKNOWN;
2665 2668
2666 /* if link is down, zero out the current_mode */ 2669 /* if link is down, zero out the current_mode */
2667 if (*link_up == false) { 2670 if (*link_up == false) {