aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Dumazet <[email protected]>2011-03-19 16:39:11 +0100
committerLinus Torvalds <[email protected]>2011-03-20 17:33:19 -0700
commitdb552b3331766e16c35550a4b83c3a42671ba73e (patch)
tree0c6db3309aeffaa27e010d48db016d22e4a3a7c9
parenta952baa034ae7c2e4a66932005cbc7ebbccfe28d (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 <[email protected]> Reported-and-tested-by: Linus Torvalds <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Acked-by:: Oliver Neukum <[email protected]> Cc: Francois Romieu <[email protected]> Tested-by: Anca Emanuel <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
-rw-r--r--drivers/net/r8169.c4
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)
rtl8169_set_speed(dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL,
ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
- tp->mii.supports_gmii ?
+ (tp->mii.supports_gmii ?
ADVERTISED_1000baseT_Half |
- ADVERTISED_1000baseT_Full : 0);
+ ADVERTISED_1000baseT_Full : 0));
if (RTL_R8(PHYstatus) & TBI_Enable)
netif_info(tp, link, dev, "TBI auto-negotiating\n");