diff options
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index fa57e3d699de..004f266e4352 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -10042,6 +10042,7 @@ static int tg3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
| 10042 | static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) | 10042 | static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) |
| 10043 | { | 10043 | { |
| 10044 | struct tg3 *tp = netdev_priv(dev); | 10044 | struct tg3 *tp = netdev_priv(dev); |
| 10045 | u32 speed = ethtool_cmd_speed(cmd); | ||
| 10045 | 10046 | ||
| 10046 | if (tg3_flag(tp, USE_PHYLIB)) { | 10047 | if (tg3_flag(tp, USE_PHYLIB)) { |
| 10047 | struct phy_device *phydev; | 10048 | struct phy_device *phydev; |
| @@ -10091,14 +10092,14 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
| 10091 | cmd->advertising &= mask; | 10092 | cmd->advertising &= mask; |
| 10092 | } else { | 10093 | } else { |
| 10093 | if (tp->phy_flags & TG3_PHYFLG_ANY_SERDES) { | 10094 | if (tp->phy_flags & TG3_PHYFLG_ANY_SERDES) { |
| 10094 | if (cmd->speed != SPEED_1000) | 10095 | if (speed != SPEED_1000) |
| 10095 | return -EINVAL; | 10096 | return -EINVAL; |
| 10096 | 10097 | ||
| 10097 | if (cmd->duplex != DUPLEX_FULL) | 10098 | if (cmd->duplex != DUPLEX_FULL) |
| 10098 | return -EINVAL; | 10099 | return -EINVAL; |
| 10099 | } else { | 10100 | } else { |
| 10100 | if (cmd->speed != SPEED_100 && | 10101 | if (speed != SPEED_100 && |
| 10101 | cmd->speed != SPEED_10) | 10102 | speed != SPEED_10) |
| 10102 | return -EINVAL; | 10103 | return -EINVAL; |
| 10103 | } | 10104 | } |
| 10104 | } | 10105 | } |
| @@ -10113,7 +10114,7 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
| 10113 | tp->link_config.duplex = DUPLEX_INVALID; | 10114 | tp->link_config.duplex = DUPLEX_INVALID; |
| 10114 | } else { | 10115 | } else { |
| 10115 | tp->link_config.advertising = 0; | 10116 | tp->link_config.advertising = 0; |
| 10116 | tp->link_config.speed = cmd->speed; | 10117 | tp->link_config.speed = speed; |
| 10117 | tp->link_config.duplex = cmd->duplex; | 10118 | tp->link_config.duplex = cmd->duplex; |
| 10118 | } | 10119 | } |
| 10119 | 10120 | ||
