diff --git a/[refs] b/[refs] index ef599d4c5640..9efdf560237d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b54d5c610fc5ba191d28c356b81999e81d9b515 +refs/heads/master: 24fcad6b3ca3bdbbb4614de3edc1ff16f594ba9a diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 23bad21b5c87..e47a9c1f35cb 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -7974,6 +7974,10 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) tp->link_config.duplex = cmd->duplex; } + tp->link_config.orig_speed = tp->link_config.speed; + tp->link_config.orig_duplex = tp->link_config.duplex; + tp->link_config.orig_autoneg = tp->link_config.autoneg; + if (netif_running(dev)) tg3_setup_phy(tp, 1);