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 215ED222D7E; Thu, 12 Dec 2024 17:08:49 +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=1734023329; cv=none; b=URpk8tM2+dS5v2QZsJbDuOyR3pCsSHdFpiDxwMvLpVTUwafTQsFgW/REhEh+YbIuTaiv/1dlDsgbS89Z4hRseTbeJNk11t4gJUCO+mhISJPl7v+5XnjIZg/iGwGrh3PdbI42m3hJLpEpdgrLB9R1gCMe6tlkphOgzf4JpuBoftU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734023329; c=relaxed/simple; bh=T3RfZG+3+kIWF3dct0C0cl9anpUDu3O5GCP8kJFO1BY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c0op8DyfpzX1LzuIIRZL5KH/320pwGfgJf9CZzjzC8TxsWQ0e2HCawruKPzK4mijbwVkJUYPpGp844d5pFUYywhIn676UNnEfa9NegCKJgQt2H+9V5Njxh7+nSAZy8uj7TweRtOUFEYRLw7hIGBK92p4fSEKFyR3kM/QBFbJ/Q4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lliG5Yga; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lliG5Yga" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94B42C4CECE; Thu, 12 Dec 2024 17:08:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734023329; bh=T3RfZG+3+kIWF3dct0C0cl9anpUDu3O5GCP8kJFO1BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lliG5YgaStDlyYCN7RWJ/gaSxfOP4BTqq14f8nDxSieEjIRZGQMCJ+lgwuR+ZiLrP /xv+1PXjOnIttMt52xsWbZFfDnciglNJCRlwcwuKlo0jHkkKxUb4w3LSPP/lfUHZYk v2iyBlsBVfi+QOSZUBnndTa7ZjokZOhvY9PBXTOI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Heiner Kallweit , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 481/565] r8169: dont apply UDP padding quirk on RTL8126A Date: Thu, 12 Dec 2024 16:01:16 +0100 Message-ID: <20241212144330.773274999@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144311.432886635@linuxfoundation.org> References: <20241212144311.432886635@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ 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 8e910f3349b2a..d9d19ea77d20b 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4148,8 +4148,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); @@ -4173,9 +4173,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