r8152: move setting r8153b_rx_agg_chg_indicate()

BugLink: https://bugs.launchpad.net/bugs/2028580
[ Upstream commit cce8334f4aacd9936309a002d4a4de92a07cd2c2 ]

Move setting r8153b_rx_agg_chg_indicate() for 2.5G devices. The
r8153b_rx_agg_chg_indicate() has to be called after enabling tx/rx.
Otherwise, the coalescing settings are useless.

Fixes: 195aae321c82 ("r8152: support new chips")
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index a7665accc81c89d6695d88f1df28a5c2209f1fe8..059d610901d8453b526f2afe628fbb0698d8f323 100644 (file)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -3027,12 +3027,16 @@ static int rtl_enable(struct r8152 *tp)
        ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, ocp_data);
 
        switch (tp->version) {
-       case RTL_VER_08:
-       case RTL_VER_09:
-       case RTL_VER_14:
-               r8153b_rx_agg_chg_indicate(tp);
+       case RTL_VER_01:
+       case RTL_VER_02:
+       case RTL_VER_03:
+       case RTL_VER_04:
+       case RTL_VER_05:
+       case RTL_VER_06:
+       case RTL_VER_07:
                break;
        default:
+               r8153b_rx_agg_chg_indicate(tp);
                break;
        }
 
@@ -3086,7 +3090,6 @@ static void r8153_set_rx_early_timeout(struct r8152 *tp)
                               640 / 8);
                ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EXTRA_AGGR_TMR,
                               ocp_data);
-               r8153b_rx_agg_chg_indicate(tp);
                break;
 
        default:
@@ -3120,7 +3123,6 @@ static void r8153_set_rx_early_size(struct r8152 *tp)
        case RTL_VER_15:
                ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_SIZE,
                               ocp_data / 8);
-               r8153b_rx_agg_chg_indicate(tp);
                break;
        default:
                WARN_ON_ONCE(1);