diff options
author | Michael Chan <mchan@broadcom.com> | 2006-12-17 20:06:46 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-18 00:59:19 -0500 |
commit | 24fcad6b3ca3bdbbb4614de3edc1ff16f594ba9a (patch) | |
tree | 1c1c7e830472218da1f5a8f40d2acfea06601c95 | |
parent | 9b54d5c610fc5ba191d28c356b81999e81d9b515 (diff) |
[TG3]: Assign tp->link_config.orig_* values.
tp->link_config.orig_* values must be assigned during
tg3_set_settings() because these values will be used to setup the
link speed during tg3_open(). Without these assignments, the link
speed settings will be all messed by if tg3_set_settings() is called
when the device is down.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/tg3.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 23bad21b5c8..e47a9c1f35c 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -7974,6 +7974,10 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
7974 | tp->link_config.duplex = cmd->duplex; | 7974 | tp->link_config.duplex = cmd->duplex; |
7975 | } | 7975 | } |
7976 | 7976 | ||
7977 | tp->link_config.orig_speed = tp->link_config.speed; | ||
7978 | tp->link_config.orig_duplex = tp->link_config.duplex; | ||
7979 | tp->link_config.orig_autoneg = tp->link_config.autoneg; | ||
7980 | |||
7977 | if (netif_running(dev)) | 7981 | if (netif_running(dev)) |
7978 | tg3_setup_phy(tp, 1); | 7982 | tg3_setup_phy(tp, 1); |
7979 | 7983 | ||