Commit 87e26448 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jakub Kicinski
Browse files

r8169: don't apply UDP padding quirk on RTL8126A



Vendor drivers r8125/r8126 indicate that this quirk isn't needed
any longer for RTL8126A. Mimic this in r8169.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/d1317187-aa81-4a69-b831-678436e4de62@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9c0fc36e
Loading
Loading
Loading
Loading
+10 −4
Original line number Diff line number Diff line
@@ -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;

	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: