Commit d6b14486 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnx2: Prevent ethtool -s from crashing when device is down.

The device may be in D3-hot state and may crash if we try to
configure the speed settings by accessing the registers.
Signed-off-by: default avatarMichael Chan <>
Signed-off-by: default avatarDavid S. Miller <>
parent 925068dc
......@@ -6215,6 +6215,12 @@ bnx2_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
!(bp->phy_flags & BNX2_PHY_FLAG_REMOTE_PHY_CAP))
goto err_out_unlock;
/* If device is down, we can store the settings only if the user
* is setting the currently active port.
if (!netif_running(dev) && cmd->port != bp->phy_port)
goto err_out_unlock;
if (cmd->autoneg == AUTONEG_ENABLE) {
autoneg |= AUTONEG_SPEED;
......@@ -6272,7 +6278,12 @@ bnx2_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
bp->req_line_speed = req_line_speed;
bp->req_duplex = req_duplex;
err = bnx2_setup_phy(bp, cmd->port);
err = 0;
/* If device is down, the new settings will be picked up when it is
* brought up.
if (netif_running(dev))
err = bnx2_setup_phy(bp, cmd->port);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment