---

yaml --- r: 66941 b: refs/heads/master c: 405d8e5 h: refs/heads/master i: 66939: cda67da v: v3
git-mirror · Oct 10, 2007 · 40a8f2f · 40a8f2f
1 parent 775203a
commit 40a8f2f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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 {