Commit ad425666 authored by Chunhao Lin's avatar Chunhao Lin Committed by David S. Miller
Browse files

r8169: move rtl_wol_enable_rx() and rtl_prepare_power_down() 



There is no functional change. Moving these two functions for following
patch "r8169: fix dmar pte write access is not set error".

Signed-off-by: default avatarChunhao Lin <hau@realtek.com>
Reviewed-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e71460d4

drivers/net/ethernet/realtek/r8169_main.c

+22 −22
Original line number Diff line number Diff line
@@ -2210,28 +2210,6 @@ static int rtl_set_mac_address(struct net_device *dev, void *p) 
	return 0;

}



static void rtl_wol_enable_rx(struct rtl8169_private *tp)

{

	if (tp->mac_version >= RTL_GIGA_MAC_VER_25)

		RTL_W32(tp, RxConfig, RTL_R32(tp, RxConfig) |

			AcceptBroadcast | AcceptMulticast | AcceptMyPhys);

}



static void rtl_prepare_power_down(struct rtl8169_private *tp)

{

	if (tp->dash_type != RTL_DASH_NONE)

		return;



	if (tp->mac_version == RTL_GIGA_MAC_VER_32 ||

	    tp->mac_version == RTL_GIGA_MAC_VER_33)

		rtl_ephy_write(tp, 0x19, 0xff64);



	if (device_may_wakeup(tp_to_dev(tp))) {

		phy_speed_down(tp->phydev, false);

		rtl_wol_enable_rx(tp);

	}

}



static void rtl_init_rxcfg(struct rtl8169_private *tp)

{

	switch (tp->mac_version) {
@@ -2455,6 +2433,28 @@ static void rtl_enable_rxdvgate(struct rtl8169_private *tp) 
	rtl_wait_txrx_fifo_empty(tp);

}



static void rtl_wol_enable_rx(struct rtl8169_private *tp)

{

	if (tp->mac_version >= RTL_GIGA_MAC_VER_25)

		RTL_W32(tp, RxConfig, RTL_R32(tp, RxConfig) |

			AcceptBroadcast | AcceptMulticast | AcceptMyPhys);

}



static void rtl_prepare_power_down(struct rtl8169_private *tp)

{

	if (tp->dash_type != RTL_DASH_NONE)

		return;



	if (tp->mac_version == RTL_GIGA_MAC_VER_32 ||

	    tp->mac_version == RTL_GIGA_MAC_VER_33)

		rtl_ephy_write(tp, 0x19, 0xff64);



	if (device_may_wakeup(tp_to_dev(tp))) {

		phy_speed_down(tp->phydev, false);

		rtl_wol_enable_rx(tp);

	}

}



static void rtl_set_tx_config_registers(struct rtl8169_private *tp)

{

	u32 val = TX_DMA_BURST << TxDMAShift |