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 1A783A04A4 for ; Wed, 27 May 2020 11:24:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9ECDC1D645; Wed, 27 May 2020 11:24:35 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 91E041D645 for ; Wed, 27 May 2020 11:24:33 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id t18so9214852wru.6 for ; Wed, 27 May 2020 02:24:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dSxeR6gAepZs7Uud8/XgyKtT0GIVFY9Lwf0bM7tfhVQ=; b=MdANoIL0R44erRjAy43lUsWWgMb+bvF+gL0gDIOOO1HcnFEP5csEqiXe2xS+UNC5gS FZ95ahs9iW+BGGetWu5kewyNAgCS1B6izGriJ87y9AaQIU4VfAOBF76LaGshZ1W5srAY sm3Q943N9hN8cqIJuou0l9SzhBN+d+yz+Q9yt30WqrC4puVyu3Z7DBp97E806zwUVtS3 y0tVTyXUqcYnyPDBl48AR9Nq/flYfL9ss0V6jpYbr/ABu7W1DiC+vF5gZm+8k5VRLrdA 4Xzv4R7jQ7myo4Kfj5dRzn73IiqAMfI54w3tAN4buKPIoBrMnpbsCCnNizgEgJYpj3sD S7Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dSxeR6gAepZs7Uud8/XgyKtT0GIVFY9Lwf0bM7tfhVQ=; b=XGOpJT4gifLGLGU70aUzufkTmijCKNrDcq63+5+vHvtd9FzQS0/k9sg/MHRnd+ZWOv O4yXbo2hBG/hOZsqEibIDpqRlJ6u92X3aKyCDlLhG8mIBf7K2poY4JEkIAREPnZVDiLU b0/vX2D5ePNRfDyco9wUerxuWTIlpw/F4phQ6BpJIiyfdNlxdZYyNbJQK8/+0fMWzVA/ R1aXBwkPaJrKJiRZwzt/VrzFjmlgejSZ2BKb3hl/n75+z/CdxpdE+6k17wL8WeLeuYwd PvqCQbWjxOp8GK9SvoCXIpbechPYMBs9M404OxPGmzaJWWN2o3ZnMRezIpXeLTpUXbJn GVqQ== X-Gm-Message-State: AOAM530U3VeuE3mec1eXBxdfi1BGYc4lpLUDqqUPs/Shm0a/P0iZXiKN a9hPEFLGZ9VoMt8WqM/aqjU= X-Google-Smtp-Source: ABdhPJxSnL56iFsa50taeChc+NTnhM0IfF+fmh+7oCBjvCZbvxDYNqNf4Nb7b3lpvdcNQdWjtCkH9Q== X-Received: by 2002:a5d:5001:: with SMTP id e1mr26017974wrt.56.1590571473168; Wed, 27 May 2020 02:24:33 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q128sm2092392wma.38.2020.05.27.02.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 02:24:32 -0700 (PDT) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: Liron Himi , David Marchand , Kevin Traynor , dpdk stable Date: Wed, 27 May 2020 10:24:04 +0100 Message-Id: <20200527092422.258652-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522094022.1025696-43-luca.boccassi@gmail.com> References: <20200522094022.1025696-43-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mvpp2: fix build with gcc 10' has been queued to stable release 19.11.3 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 stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/29/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. Thanks. Luca Boccassi --- >From 4d1fd43b3a90f96882b5e4dd23187f2501263457 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon 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 Acked-by: Liron Himi Acked-by: David Marchand Acked-by: Kevin Traynor --- 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 381b54e291..ea43255284 100644 --- a/drivers/net/mvpp2/mrvl_flow.c +++ b/drivers/net/mvpp2/mrvl_flow.c @@ -2511,14 +2511,14 @@ 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; } 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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-27 10:23:31.692416519 +0100 +++ 0001-net-mvpp2-fix-build-with-gcc-10.patch 2020-05-27 10:23:31.615933607 +0100 @@ -1,8 +1,10 @@ -From 7f55a2053b908ff08a8a2d1cc8d4d927923d52f7 Mon Sep 17 00:00:00 2001 +From 4d1fd43b3a90f96882b5e4dd23187f2501263457 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon 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. @@ -13,7 +15,6 @@ An assigned field is also fixed from "tcp" to "udp". Fixes: 7235341d7517 ("net/mrvl: support classifier") -Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon Acked-by: Liron Himi