From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AF43DA053D for ; Fri, 17 Jul 2020 18:32:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A98AB1BED6; Fri, 17 Jul 2020 18:32:54 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 12B871BEE6 for ; Fri, 17 Jul 2020 18:32:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595003571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AO3HoXupzMM571OZyd8UkJ3FmVOYt/+g50IccccHV/o=; b=csOme0MsPmvCISh6VWr706GX48KyPsumrqHNtOd7r5N5mW/KIOIxxtxslQP2MXbR56PvVA Y55oPENN6noXvU0rrz7v1ZlFink5//tWJndpqrbDGxyMTly8gZpvEYSYULZrGj4ewpdicv lhcCJQQbSFD15ZwQCrKq8vStZcjQBKU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-506-nfdLpqrWOuSCj9thsNrOkw-1; Fri, 17 Jul 2020 12:32:38 -0400 X-MC-Unique: nfdLpqrWOuSCj9thsNrOkw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 33F86107ACCA; Fri, 17 Jul 2020 16:32:37 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id A978E75559; Fri, 17 Jul 2020 16:32:35 +0000 (UTC) From: Kevin Traynor To: Hongzhi Guo Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Olivier Matz , dpdk stable Date: Fri, 17 Jul 2020 17:31:56 +0100 Message-Id: <20200717163214.4839-8-ktraynor@redhat.com> In-Reply-To: <20200717163214.4839-1-ktraynor@redhat.com> References: <20200717163214.4839-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net: fix IPv4 checksum' has been queued to LTS release 18.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/e0b3cc68e52cfa4d9ddabc7737ab2404d109d1df Thanks. Kevin. --- >From e0b3cc68e52cfa4d9ddabc7737ab2404d109d1df Mon Sep 17 00:00:00 2001 From: Hongzhi Guo Date: Tue, 26 May 2020 18:08:05 +0800 Subject: [PATCH] net: fix IPv4 checksum MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 06602c671a5ee23f517456424b216b2427c4334c ] 0xffff is invalid for IPv4 checksum (RFC1624) Fixes: 6006818cfb26 ("net: new checksum functions") Signed-off-by: Hongzhi Guo Reviewed-by: Morten Brørup Acked-by: Olivier Matz --- lib/librte_net/rte_ip.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h index 7639164c2e..2c78ba6cf6 100644 --- a/lib/librte_net/rte_ip.h +++ b/lib/librte_net/rte_ip.h @@ -260,5 +260,5 @@ rte_ipv4_cksum(const struct ipv4_hdr *ipv4_hdr) uint16_t cksum; cksum = rte_raw_cksum(ipv4_hdr, sizeof(struct ipv4_hdr)); - return (cksum == 0xffff) ? cksum : (uint16_t)~cksum; + return (uint16_t)~cksum; } -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-17 17:17:00.441604102 +0100 +++ 0008-net-fix-IPv4-checksum.patch 2020-07-17 17:16:59.964771768 +0100 @@ -1 +1 @@ -From 06602c671a5ee23f517456424b216b2427c4334c Mon Sep 17 00:00:00 2001 +From e0b3cc68e52cfa4d9ddabc7737ab2404d109d1df Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 06602c671a5ee23f517456424b216b2427c4334c ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 4c4437a547..292f63fd74 100644 +index 7639164c2e..2c78ba6cf6 100644 @@ -25 +26 @@ -@@ -268,5 +268,5 @@ rte_ipv4_cksum(const struct rte_ipv4_hdr *ipv4_hdr) +@@ -260,5 +260,5 @@ rte_ipv4_cksum(const struct ipv4_hdr *ipv4_hdr) @@ -27 +28 @@ - cksum = rte_raw_cksum(ipv4_hdr, sizeof(struct rte_ipv4_hdr)); + cksum = rte_raw_cksum(ipv4_hdr, sizeof(struct ipv4_hdr));