diff --git a/[refs] b/[refs]
index 6814a7ada6c8..f3d763d7cc4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 630e499724bda4ecb62b1f6652656e886f04197f
+refs/heads/master: 405d8e5cbbe5aca20cc745046b70831bfc5e4a8f
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index b1e5660baf4a..1e0c9e0dc394 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -8101,7 +8101,8 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
 	tp->link_config.autoneg = cmd->autoneg;
 	if (cmd->autoneg == AUTONEG_ENABLE) {
-		tp->link_config.advertising = cmd->advertising;
+		tp->link_config.advertising = (cmd->advertising |
+					      ADVERTISED_Autoneg);
 		tp->link_config.speed = SPEED_INVALID;
 		tp->link_config.duplex = DUPLEX_INVALID;
 	} else {