diff options
| author | hayeswang <hayeswang@realtek.com> | 2017-06-09 17:11:41 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-09 15:37:00 -0400 |
| commit | e31f636721ac13814250289c9f15b4f52af95e3c (patch) | |
| tree | 1dd6fa4ee9d564a4040f68d5b9dec8e1d04a95f5 /drivers/net/usb | |
| parent | 134f98bcf1b898fb9d6f2b91bc85dd2e5478b4b8 (diff) | |
| download | linux-stable-e31f636721ac13814250289c9f15b4f52af95e3c.tar.gz linux-stable-e31f636721ac13814250289c9f15b4f52af95e3c.tar.bz2 linux-stable-e31f636721ac13814250289c9f15b4f52af95e3c.zip | |
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: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/r8152.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 9a794dbf94e9..e569c488a6b9 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -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); |