r8169: tweak max read request size for newer chips also in jumbo mtu mode

So far we don't increase the max read request size if we switch to
jumbo mode before bringing up the interface for the first time.
Let's change this.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index c4c2647c54e733e4825e6034960177d5b3d7a79c..bfcc64db88032d5361d03226f1010eab5a61d61d 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -2341,13 +2341,14 @@ static void r8168b_1_hw_jumbo_disable(struct rtl8169_private *tp)
 static void rtl_jumbo_config(struct rtl8169_private *tp)
 {
        bool jumbo = tp->dev->mtu > ETH_DATA_LEN;
+       int readrq = 4096;
 
        rtl_unlock_config_regs(tp);
        switch (tp->mac_version) {
        case RTL_GIGA_MAC_VER_12:
        case RTL_GIGA_MAC_VER_17:
                if (jumbo) {
-                       pcie_set_readrq(tp->pci_dev, 512);
+                       readrq = 512;
                        r8168b_1_hw_jumbo_enable(tp);
                } else {
                        r8168b_1_hw_jumbo_disable(tp);
@@ -2355,7 +2356,7 @@ static void rtl_jumbo_config(struct rtl8169_private *tp)
                break;
        case RTL_GIGA_MAC_VER_18 ... RTL_GIGA_MAC_VER_26:
                if (jumbo) {
-                       pcie_set_readrq(tp->pci_dev, 512);
+                       readrq = 512;
                        r8168c_hw_jumbo_enable(tp);
                } else {
                        r8168c_hw_jumbo_disable(tp);
@@ -2378,8 +2379,8 @@ static void rtl_jumbo_config(struct rtl8169_private *tp)
        }
        rtl_lock_config_regs(tp);
 
-       if (!jumbo && pci_is_pcie(tp->pci_dev) && tp->supports_gmii)
-               pcie_set_readrq(tp->pci_dev, 4096);
+       if (pci_is_pcie(tp->pci_dev) && tp->supports_gmii)
+               pcie_set_readrq(tp->pci_dev, readrq);
 }
 
 DECLARE_RTL_COND(rtl_chipcmd_cond)