diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/smc911x.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/smc911x.c')
| -rw-r--r-- | drivers/net/smc911x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 66831f378396..053863aefb12 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c | |||
| @@ -1488,9 +1488,9 @@ smc911x_ethtool_getsettings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
| 1488 | SUPPORTED_TP | SUPPORTED_AUI; | 1488 | SUPPORTED_TP | SUPPORTED_AUI; |
| 1489 | 1489 | ||
| 1490 | if (lp->ctl_rspeed == 10) | 1490 | if (lp->ctl_rspeed == 10) |
| 1491 | cmd->speed = SPEED_10; | 1491 | ethtool_cmd_speed_set(cmd, SPEED_10); |
| 1492 | else if (lp->ctl_rspeed == 100) | 1492 | else if (lp->ctl_rspeed == 100) |
| 1493 | cmd->speed = SPEED_100; | 1493 | ethtool_cmd_speed_set(cmd, SPEED_100); |
| 1494 | 1494 | ||
| 1495 | cmd->autoneg = AUTONEG_DISABLE; | 1495 | cmd->autoneg = AUTONEG_DISABLE; |
| 1496 | if (lp->mii.phy_id==1) | 1496 | if (lp->mii.phy_id==1) |