From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id DBC19A04A3
for <public@inbox.dpdk.org>; Fri, 5 Jun 2020 20:27:56 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id D4A261D515;
Fri, 5 Jun 2020 20:27:56 +0200 (CEST)
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
[207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 444C21D514
for <stable@dpdk.org>; Fri, 5 Jun 2020 20:27:55 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1591381674;
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=nWB6Zr3oERFamJTwLBpMStsbO4EEiDP2bOQVPkreymo=;
b=Uq/UIYerSoJk1oFxWoMamuDVWtAvadR2J0Hb+jJrWYM5s/8SkPAnJ8ZxVB5XZ5hqJjPmNe
Jgheo+GLV3XWXqckNxzvH424DEFenvbv7UtgxfamcP69r5x6gihPDgGJbQiZS+nHEaTqfC
QLOzvH9NTI4YfUxeCtYdOvsmeonEhmg=
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-143-tMtX7HIZNCGcmahrF8lfWA-1; Fri, 05 Jun 2020 14:27:51 -0400
X-MC-Unique: tMtX7HIZNCGcmahrF8lfWA-1
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E7238800685;
Fri, 5 Jun 2020 18:27:49 +0000 (UTC)
Received: from rh.redhat.com (unknown [10.33.36.130])
by smtp.corp.redhat.com (Postfix) with ESMTP id 051CF60F80;
Fri, 5 Jun 2020 18:27:45 +0000 (UTC)
From: Kevin Traynor <ktraynor@redhat.com>
To: Thomas Monjalon <thomas@monjalon.net>
Cc: Liron Himi <lironh@marvell.com>,
David Marchand <david.marchand@redhat.com>,
Kevin Traynor <ktraynor@redhat.com>, dpdk stable <stable@dpdk.org>
Date: Fri, 5 Jun 2020 19:25:12 +0100
Message-Id: <20200605182525.22483-75-ktraynor@redhat.com>
In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com>
References: <20200605182525.22483-1-ktraynor@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/mvpp2: fix build with gcc 10' has been
queued to LTS release 18.11.9
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to LTS release 18.11.9
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/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/25d6dfdc154ffa3f544c2d109263c8c672f65ca3
Thanks.
Kevin.
---
>From 25d6dfdc154ffa3f544c2d109263c8c672f65ca3 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Wed, 20 May 2020 11:56:02 +0200
Subject: [PATCH] net/mvpp2: fix build with gcc 10
[ upstream commit 7f55a2053b908ff08a8a2d1cc8d4d927923d52f7 ]
GCC 10 is detecting the enum mismatch when assigning UDP variables
with MUSDK constants for TCP.
drivers/net/mvpp2/mrvl_flow.c:2521:47: error: implicit conversion
from 'enum mv_net_tcp_fields' to 'enum mv_net_udp_fields'
[-Werror=enum-conversion]
An assigned field is also fixed from "tcp" to "udp".
Fixes: 7235341d7517 ("net/mrvl: support classifier")
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Liron Himi <lironh@marvell.com>
Acked-by: David Marchand <david.marchand@redhat.com>
Acked-by: Kevin Traynor <ktraynor@redhat.com>
---
drivers/net/mvpp2/mrvl_flow.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mvpp2/mrvl_flow.c b/drivers/net/mvpp2/mrvl_flow.c
index ffd1dab9b5..8b1ec7e2bc 100644
--- a/drivers/net/mvpp2/mrvl_flow.c
+++ b/drivers/net/mvpp2/mrvl_flow.c
@@ -2512,5 +2512,5 @@ mrvl_create_cls_table(struct rte_eth_dev *dev, struct rte_flow *first_flow)
if (first_flow->pattern & F_UDP_SPORT) {
key->proto_field[key->num_fields].proto = MV_NET_PROTO_UDP;
- key->proto_field[key->num_fields].field.tcp = MV_NET_TCP_F_SP;
+ key->proto_field[key->num_fields].field.udp = MV_NET_UDP_F_SP;
key->key_size += 2;
key->num_fields += 1;
@@ -2519,5 +2519,5 @@ mrvl_create_cls_table(struct rte_eth_dev *dev, struct rte_flow *first_flow)
if (first_flow->pattern & F_UDP_DPORT) {
key->proto_field[key->num_fields].proto = MV_NET_PROTO_UDP;
- key->proto_field[key->num_fields].field.udp = MV_NET_TCP_F_DP;
+ key->proto_field[key->num_fields].field.udp = MV_NET_UDP_F_DP;
key->key_size += 2;
key->num_fields += 1;
--
2.21.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-06-05 19:20:54.943436404 +0100
+++ 0075-net-mvpp2-fix-build-with-gcc-10.patch 2020-06-05 19:20:50.979036974 +0100
@@ -1 +1 @@
-From 7f55a2053b908ff08a8a2d1cc8d4d927923d52f7 Mon Sep 17 00:00:00 2001
+From 25d6dfdc154ffa3f544c2d109263c8c672f65ca3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7f55a2053b908ff08a8a2d1cc8d4d927923d52f7 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -27 +28 @@
-index 381b54e291..ea43255284 100644
+index ffd1dab9b5..8b1ec7e2bc 100644