| Message ID | 32cb0ca8-3a90-1b95-b928-af00c603876f@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v2,net] r8169: fix rtl_hw_jumbo_disable for RTL8168evl | expand |
From: Heiner Kallweit <hkallweit1@gmail.com> Date: Sat, 7 Dec 2019 22:21:52 +0100 > In referenced fix we removed the RTL8168e-specific jumbo config for > RTL8168evl in rtl_hw_jumbo_enable(). We have to do the same in > rtl_hw_jumbo_disable(). > > v2: fix referenced commit id > > Fixes: 14012c9f3bb9 ("r8169: fix jumbo configuration for RTL8168evl") > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Applied. Again, another fun chain of fixes to fixes: [davem@localhost net]$ git describe 14012c9f3bb9 v5.4-8858-g14012c9f3bb9 [davem@localhost net]$ git show 14012c9f3bb9 | grep Fixes Fixes: 4ebcb113edcc ("r8169: fix jumbo packet handling on resume from suspend") [davem@localhost net]$ gdc 4ebcb113edcc v5.4-rc4~6^2~55 [davem@localhost net]$ git show 4ebcb113edcc | grep Fixes Fixes: 7366016d2d4c ("r8169: read common register for PCI commit") [davem@localhost net]$ gdc 7366016d2d4c v5.4-rc1~131^2~119^2~4
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 38d212686..46a492229 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -3896,7 +3896,7 @@ static void rtl_hw_jumbo_disable(struct rtl8169_private *tp) case RTL_GIGA_MAC_VER_27 ... RTL_GIGA_MAC_VER_28: r8168dp_hw_jumbo_disable(tp); break; - case RTL_GIGA_MAC_VER_31 ... RTL_GIGA_MAC_VER_34: + case RTL_GIGA_MAC_VER_31 ... RTL_GIGA_MAC_VER_33: r8168e_hw_jumbo_disable(tp); break; default:
In referenced fix we removed the RTL8168e-specific jumbo config for RTL8168evl in rtl_hw_jumbo_enable(). We have to do the same in rtl_hw_jumbo_disable(). v2: fix referenced commit id Fixes: 14012c9f3bb9 ("r8169: fix jumbo configuration for RTL8168evl") Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/net/ethernet/realtek/r8169_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)