tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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 <piotr@hosowicz.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Oliver Neukum <oliver@neukum.org>
Cc: Francois Romieu <romieu@fr.zoreil.com>
Tested-by: Anca Emanuel <anca.emanuel@gmail.com>
Tested-by: Piotr Hosowicz <piotr@hosowicz.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by Eric Dumazet and committed by David S. Miller b26fa4e0 dadaa10b

+2 -2
unified split
+2 -2
drivers/net/r8169.c
··· 2685 2685 rtl8169_set_speed(dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL, 2686 2686 ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full | 2687 2687 ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full | 2688 - tp->mii.supports_gmii ? 2688 + (tp->mii.supports_gmii ? 2689 2689 ADVERTISED_1000baseT_Half | 2690 - ADVERTISED_1000baseT_Full : 0); 2690 + ADVERTISED_1000baseT_Full : 0)); 2691 2691 2692 2692 if (RTL_R8(PHYstatus) & TBI_Enable) 2693 2693 netif_info(tp, link, dev, "TBI auto-negotiating\n");