Commit db552b33 authored Mar 19, 2011 by Eric Dumazet Committed by Linus Torvalds Mar 20, 2011

r8169: fix a bug in rtl8169_init_phy()



commit 54405cde (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>

parent a952baa0

drivers/net/r8169.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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");

Admin message