From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 140571C07EB; Sun, 24 Nov 2024 13:34:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732455293; cv=none; b=IejT8JpaLjRLjM3rWAuClLgkSDaGW16wFHSrRNvY31VP/dRmpqKo3OMNBSAej5cQ5+6EXTeQXmes/YoHf4kTBjBvuK1ZrbkVlR4+cHSSguYOnCvT8TME9u08ChiCYe6sOIO5uBOiAzMoOrJXbiwWHinO+FyXrNeK+Vg6kfoh4Dc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732455293; c=relaxed/simple; bh=UStBwBWjXM3/zyxXtAST7q3BI5tDjcJrqU5Zq2Wb8oA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MEC1RXei1iJDdN66ulu/BT8JI2m8AKYK6cD0d1yEtWqURwltSvQ3xYrDDu4qyexB6fM+AL8JfY8FqhjMgE3tIxrbZ33z5SNhXoV7vXBHcoBqI2i4RIgs5Oomgd6HeVGrjrsvvLCErotOauIn5tX3TsDAejKZQ4dUJKxIMskxph8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hCw062wJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hCw062wJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 48D32C4CED3; Sun, 24 Nov 2024 13:34:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732455292; bh=UStBwBWjXM3/zyxXtAST7q3BI5tDjcJrqU5Zq2Wb8oA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hCw062wJ5eoj5agu4PGbBRGivkHsiSaHqU23GLGq80z4rzW8ZLwSn9HckntP3CxTV sTot13L0Uhn2+tfM3Q+KN22IZMm7oYBqOdqhsh+EOKa3ZQM38TRADxvQSm7/beZrTk V8CqHDDh+n6XvxoJgQXAuQ3x2wXySOqJulAcDctBXebrAMtsCnfzw2pxhZNJRpuKZo XM3dDkcGPpsfd8kMTUdAZgfm39JhOoV+I/Hz3jmL0hF0CieUlD0FMncS+4T15eTfYp LjeegRyH3b20E1akB9r0nK/HATpuvQWM2noL1RHaEoj5+XunpqV4RXBTftgUClioYY Ucxrg1AnqzwvQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Heiner Kallweit , Simon Horman , Jakub Kicinski , Sasha Levin , nic_swsd@realtek.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.12 030/107] r8169: don't apply UDP padding quirk on RTL8126A Date: Sun, 24 Nov 2024 08:28:50 -0500 Message-ID: <20241124133301.3341829-30-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241124133301.3341829-1-sashal@kernel.org> References: <20241124133301.3341829-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.1 Content-Transfer-Encoding: 8bit From: Heiner Kallweit [ Upstream commit 87e26448dbda4523b73a894d96f0f788506d3795 ] Vendor drivers r8125/r8126 indicate that this quirk isn't needed any longer for RTL8126A. Mimic this in r8169. Signed-off-by: Heiner Kallweit Reviewed-by: Simon Horman Link: https://patch.msgid.link/d1317187-aa81-4a69-b831-678436e4de62@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/realtek/r8169_main.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 713a89bb21e93..5ed2818bac257 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4233,8 +4233,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); @@ -4258,9 +4258,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: -- 2.43.0