diff options
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r-- | drivers/net/bnx2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index bf729ee6acbd..e43efd86425b 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -6758,21 +6758,21 @@ bnx2_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
6758 | advertising |= ADVERTISED_Autoneg; | 6758 | advertising |= ADVERTISED_Autoneg; |
6759 | } | 6759 | } |
6760 | else { | 6760 | else { |
6761 | u32 speed = ethtool_cmd_speed(cmd); | ||
6761 | if (cmd->port == PORT_FIBRE) { | 6762 | if (cmd->port == PORT_FIBRE) { |
6762 | if ((cmd->speed != SPEED_1000 && | 6763 | if ((speed != SPEED_1000 && |
6763 | cmd->speed != SPEED_2500) || | 6764 | speed != SPEED_2500) || |
6764 | (cmd->duplex != DUPLEX_FULL)) | 6765 | (cmd->duplex != DUPLEX_FULL)) |
6765 | goto err_out_unlock; | 6766 | goto err_out_unlock; |
6766 | 6767 | ||
6767 | if (cmd->speed == SPEED_2500 && | 6768 | if (speed == SPEED_2500 && |
6768 | !(bp->phy_flags & BNX2_PHY_FLAG_2_5G_CAPABLE)) | 6769 | !(bp->phy_flags & BNX2_PHY_FLAG_2_5G_CAPABLE)) |
6769 | goto err_out_unlock; | 6770 | goto err_out_unlock; |
6770 | } | 6771 | } else if (speed == SPEED_1000 || speed == SPEED_2500) |
6771 | else if (cmd->speed == SPEED_1000 || cmd->speed == SPEED_2500) | ||
6772 | goto err_out_unlock; | 6772 | goto err_out_unlock; |
6773 | 6773 | ||
6774 | autoneg &= ~AUTONEG_SPEED; | 6774 | autoneg &= ~AUTONEG_SPEED; |
6775 | req_line_speed = cmd->speed; | 6775 | req_line_speed = speed; |
6776 | req_duplex = cmd->duplex; | 6776 | req_duplex = cmd->duplex; |
6777 | advertising = 0; | 6777 | advertising = 0; |
6778 | } | 6778 | } |