| Message ID | d1317187-aa81-4a69-b831-678436e4de62@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 87e26448dbda4523b73a894d96f0f788506d3795 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] r8169: don't apply UDP padding quirk on RTL8126A | expand |
On Wed, Oct 09, 2024 at 07:44:23AM +0200, Heiner Kallweit wrote: > Vendor drivers r8125/r8126 indicate that this quirk isn't needed > any longer for RTL8126A. Mimic this in r8169. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Simon Horman <horms@kernel.org> ...
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 9 Oct 2024 07:44:23 +0200 you wrote: > Vendor drivers r8125/r8126 indicate that this quirk isn't needed > any longer for RTL8126A. Mimic this in r8169. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > drivers/net/ethernet/realtek/r8169_main.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) Here is the summary with links: - [net-next] r8169: don't apply UDP padding quirk on RTL8126A https://git.kernel.org/netdev/net-next/c/87e26448dbda You are awesome, thank you!
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 6a9259d85..6789c1c78 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4234,8 +4234,8 @@ static unsigned int rtl8125_quirk_udp_padto(struct rtl8169_private *tp, { unsigned int padto = 0, len = skb->len; - if (rtl_is_8125(tp) && len < 128 + RTL_MIN_PATCH_LEN && - rtl_skb_is_udp(skb) && skb_transport_header_was_set(skb)) { + if (len < 128 + RTL_MIN_PATCH_LEN && rtl_skb_is_udp(skb) && + skb_transport_header_was_set(skb)) { unsigned int trans_data_len = skb_tail_pointer(skb) - skb_transport_header(skb); @@ -4259,9 +4259,15 @@ static unsigned int rtl8125_quirk_udp_padto(struct rtl8169_private *tp, static unsigned int rtl_quirk_packet_padto(struct rtl8169_private *tp, struct sk_buff *skb) { - unsigned int padto; + unsigned int padto = 0; - padto = rtl8125_quirk_udp_padto(tp, skb); + switch (tp->mac_version) { + case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_63: + padto = rtl8125_quirk_udp_padto(tp, skb); + break; + default: + break; + } switch (tp->mac_version) { case RTL_GIGA_MAC_VER_34:
Vendor drivers r8125/r8126 indicate that this quirk isn't needed any longer for RTL8126A. Mimic this in r8169. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/net/ethernet/realtek/r8169_main.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)