Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e01df28 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux

parents 04c9f416 5f8bcce9

drivers/net/ethernet/realtek/r8169.c

+2 −2
Original line number Diff line number Diff line
@@ -6753,14 +6753,14 @@ static void __devinit rtl_hw_init_8168g(struct rtl8169_private *tp) 
	msleep(1);

	RTL_W8(MCU, RTL_R8(MCU) & ~NOW_IS_OOB);



	data = r8168_mac_ocp_read(ioaddr, 0xe8de);

	data = r8168_mac_ocp_read(tp, 0xe8de);

	data &= ~(1 << 14);

	r8168_mac_ocp_write(tp, 0xe8de, data);



	if (!rtl_udelay_loop_wait_high(tp, &rtl_link_list_ready_cond, 100, 42))

		return;



	data = r8168_mac_ocp_read(ioaddr, 0xe8de);

	data = r8168_mac_ocp_read(tp, 0xe8de);

	data |= (1 << 15);

	r8168_mac_ocp_write(tp, 0xe8de, data);