projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a952baa)
r8169: fix a bug in rtl8169_init_phy()
authorEric Dumazet <eric.dumazet@gmail.com>
Sat, 19 Mar 2011 15:39:11 +0000 (16:39 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Mar 2011 00:33:19 +0000 (17:33 -0700)
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>
drivers/net/r8169.c patch | blob | blame | history

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 5e403511289de11b17f189c9649cdeb66cfdc1ee..493b0de3848bf17fadd6741ad57d5b4701b2f074 100644 (file)
--- 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");