diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /drivers/net/r8169.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'drivers/net/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 5e403511289d..493b0de3848b 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
| @@ -2685,9 +2685,9 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp) | |||
| 2685 | rtl8169_set_speed(dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL, | 2685 | rtl8169_set_speed(dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL, |
| 2686 | ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full | | 2686 | ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full | |
| 2687 | ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full | | 2687 | ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full | |
| 2688 | tp->mii.supports_gmii ? | 2688 | (tp->mii.supports_gmii ? |
| 2689 | ADVERTISED_1000baseT_Half | | 2689 | ADVERTISED_1000baseT_Half | |
| 2690 | ADVERTISED_1000baseT_Full : 0); | 2690 | ADVERTISED_1000baseT_Full : 0)); |
| 2691 | 2691 | ||
| 2692 | if (RTL_R8(PHYstatus) & TBI_Enable) | 2692 | if (RTL_R8(PHYstatus) & TBI_Enable) |
| 2693 | netif_info(tp, link, dev, "TBI auto-negotiating\n"); | 2693 | netif_info(tp, link, dev, "TBI auto-negotiating\n"); |