Skip to content

Commit 08ed48e

Browse files
etantilovJeff Kirsher
authored andcommitted
ixgbe: always call setup_mac_link for multispeed fiber
Remove the logic which would previously skip the link configuration in the case where we are already at the requested speed in ixgbe_setup_mac_link_multispeed_fiber(). By exiting early we are skipping the link configuration and as such the driver may not always configure the PHY correctly for SFP+. Signed-off-by: Emil Tantilov <[email protected]> Tested-by: Andrew Bowers <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
1 parent 410a494 commit 08ed48e

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

drivers/net/ethernet/intel/ixgbe/ixgbe_common.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4121,15 +4121,6 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
41214121
speedcnt++;
41224122
highest_link_speed = IXGBE_LINK_SPEED_10GB_FULL;
41234123

4124-
/* If we already have link at this speed, just jump out */
4125-
status = hw->mac.ops.check_link(hw, &link_speed, &link_up,
4126-
false);
4127-
if (status)
4128-
return status;
4129-
4130-
if (link_speed == IXGBE_LINK_SPEED_10GB_FULL && link_up)
4131-
goto out;
4132-
41334124
/* Set the module link speed */
41344125
switch (hw->phy.media_type) {
41354126
case ixgbe_media_type_fiber:
@@ -4181,15 +4172,6 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
41814172
if (highest_link_speed == IXGBE_LINK_SPEED_UNKNOWN)
41824173
highest_link_speed = IXGBE_LINK_SPEED_1GB_FULL;
41834174

4184-
/* If we already have link at this speed, just jump out */
4185-
status = hw->mac.ops.check_link(hw, &link_speed, &link_up,
4186-
false);
4187-
if (status)
4188-
return status;
4189-
4190-
if (link_speed == IXGBE_LINK_SPEED_1GB_FULL && link_up)
4191-
goto out;
4192-
41934175
/* Set the module link speed */
41944176
switch (hw->phy.media_type) {
41954177
case ixgbe_media_type_fiber:

0 commit comments

Comments
 (0)