Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

r8169: don't apply UDP padding quirk on RTL8126A

Browse Source 
[ Upstream commit 87e26448db ]

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>
Link: https://patch.msgid.link/d1317187-aa81-4a69-b831-678436e4de62@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Heiner Kallweit 2024-10-09 07:44:23 +02:00 committed by Greg Kroah-Hartman
parent c5648abf72
commit 77f168247b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/realtek/r8169_main.c
View File

@ -4139,8 +4139,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);
@ -4164,9 +4164,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: