projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7073949
)
acenic: Fix using the specified speed when configuring NIC
author
David Decotigny
<decot@google.com>
Wed, 27 Apr 2011 18:32:41 +0000
(18:32 +0000)
committer
David S. Miller
<davem@davemloft.net>
Fri, 29 Apr 2011 21:03:02 +0000
(14:03 -0700)
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: David Decotigny <decot@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/acenic.c
patch
|
blob
|
history
diff --git
a/drivers/net/acenic.c
b/drivers/net/acenic.c
index
a579899
..
82260ca
100644
(file)
--- a/
drivers/net/acenic.c
+++ b/
drivers/net/acenic.c
@@
-2720,7
+2720,7
@@
static int ace_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
link |= LNK_NEGOTIATE;
if (ethtool_cmd_speed(ecmd) != speed) {
link &= ~(LNK_1000MB | LNK_100MB | LNK_10MB);
- switch (
speed
) {
+ switch (
ethtool_cmd_speed(ecmd)
) {
case SPEED_1000:
link |= LNK_1000MB;
break;