Commit e31f6367 authored by hayeswang's avatar hayeswang Committed by David S. Miller
Browse files

r8152: move the setting of rx aggregation 



Move the setting from r8153_first_init() to r8153_init(). It only needs to
be set once.

Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 134f98bc

drivers/net/usb/r8152.c

+4 −5
Original line number Diff line number Diff line
@@ -2961,11 +2961,6 @@ static void r8153_first_init(struct r8152 *tp) 
	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, RXFIFO_THR3_NORMAL);

	/* TX share fifo free credit full threshold */

	ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, TXFIFO_THR_NORMAL2);



	/* rx aggregation */

	ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);

	ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);

	ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);

}



static void r8153_enter_oob(struct r8152 *tp)
@@ -3544,6 +3539,10 @@ static void r8153_init(struct r8152 *tp) 
	r8153_mac_clk_spd(tp, false);

	usb_enable_lpm(tp->udev);



	/* rx aggregation */

	ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);

	ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);

	ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);



	rtl_tally_reset(tp);

	r8153_u2p3en(tp, true);