[PATCH] r8169: fix a bug in rtl8169_init_phy()

Le samedi 19 mars 2011 à 16:33 +0100, Eric Dumazet a écrit :

Le samedi 19 mars 2011 à 16:31 +0100, Oliver Neukum a écrit :

quoted

Am Samstag, 19. März 2011, 16:18:50 schrieb Eric Dumazet:

quoted

Problem comes from commit 54405cde762408b00a445466a40da4f7f33a8479
(r8169: support control of advertising.)

Reverting it brings back NIC for me

Odd. It worked for me. Are you testing on a gigabit switch? Could you send
me dmesg? Does it work if you use ethtool to advertise a lower speed?

	Regards
		Oliver

I found the bug, I am sending a patch in two minutes.

Here it is

[PATCH] r8169: fix a bug in rtl8169_init_phy()

commit 54405cde7624 (r8169: support control of advertising.)
introduced a bug in rtl8169_init_phy()

Reported-by: Piotr Hosowicz <redacted>
Signed-off-by: Eric Dumazet <redacted>
Cc: Oliver Neukum <oliver@neukum.org>
Cc: Francois Romieu <romieu@fr.zoreil.com>
---
 drivers/net/r8169.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 5e40351..493b0de 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");