提交 1258c076 编写于 作者: D David Decotigny 提交者: David S. Miller

acenic: Fix using the specified speed when configuring NIC

This tells the NIC to take the speed specified by ethtool into account
when configuring the NIC, instead of keeping the previous speed.
Signed-off-by: NDavid Decotigny <decot@google.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 70739497
...@@ -2720,7 +2720,7 @@ static int ace_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) ...@@ -2720,7 +2720,7 @@ static int ace_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
link |= LNK_NEGOTIATE; link |= LNK_NEGOTIATE;
if (ethtool_cmd_speed(ecmd) != speed) { if (ethtool_cmd_speed(ecmd) != speed) {
link &= ~(LNK_1000MB | LNK_100MB | LNK_10MB); link &= ~(LNK_1000MB | LNK_100MB | LNK_10MB);
switch (speed) { switch (ethtool_cmd_speed(ecmd)) {
case SPEED_1000: case SPEED_1000:
link |= LNK_1000MB; link |= LNK_1000MB;
break; break;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册