diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-03-19 11:39:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 20:33:19 -0400 |
commit | db552b3331766e16c35550a4b83c3a42671ba73e (patch) | |
tree | 0c6db3309aeffaa27e010d48db016d22e4a3a7c9 /drivers/net/r8169.c | |
parent | a952baa034ae7c2e4a66932005cbc7ebbccfe28d (diff) |
r8169: fix a bug in rtl8169_init_phy()
commit 54405cde7624 (r8169: support control of advertising.)
introduced a bug in rtl8169_init_phy()
Reported-and-tested-by: Piotr Hosowicz <piotr@hosowicz.com>
Reported-and-tested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by:: Oliver Neukum <oliver@neukum.org>
Cc: Francois Romieu <romieu@fr.zoreil.com>
Tested-by: Anca Emanuel <anca.emanuel@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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"); |