diff options
Diffstat (limited to 'drivers/net/bnx2.c')
| -rw-r--r-- | drivers/net/bnx2.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index e43efd86425b..1bebdfb9679f 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
| @@ -6696,17 +6696,16 @@ bnx2_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
| 6696 | 6696 | ||
| 6697 | if (bp->autoneg & AUTONEG_SPEED) { | 6697 | if (bp->autoneg & AUTONEG_SPEED) { |
| 6698 | cmd->autoneg = AUTONEG_ENABLE; | 6698 | cmd->autoneg = AUTONEG_ENABLE; |
| 6699 | } | 6699 | } else { |
| 6700 | else { | ||
| 6701 | cmd->autoneg = AUTONEG_DISABLE; | 6700 | cmd->autoneg = AUTONEG_DISABLE; |
| 6702 | } | 6701 | } |
| 6703 | 6702 | ||
| 6704 | if (netif_carrier_ok(dev)) { | 6703 | if (netif_carrier_ok(dev)) { |
| 6705 | cmd->speed = bp->line_speed; | 6704 | ethtool_cmd_speed_set(cmd, bp->line_speed); |
| 6706 | cmd->duplex = bp->duplex; | 6705 | cmd->duplex = bp->duplex; |
| 6707 | } | 6706 | } |
| 6708 | else { | 6707 | else { |
| 6709 | cmd->speed = -1; | 6708 | ethtool_cmd_speed_set(cmd, -1); |
| 6710 | cmd->duplex = -1; | 6709 | cmd->duplex = -1; |
| 6711 | } | 6710 | } |
| 6712 | spin_unlock_bh(&bp->phy_lock); | 6711 | spin_unlock_bh(&bp->phy_lock); |
