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 AE3AEA0093 for ; Tue, 19 May 2020 15:13:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 992B91D8E9; Tue, 19 May 2020 15:13:39 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 8B2171D702 for ; Tue, 19 May 2020 15:13:38 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id l11so15930749wru.0 for ; Tue, 19 May 2020 06:13:38 -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=vkqoLjkHeobC9Na2nR7Vp7qBzX/7In3T1XtEkSY44Kw=; b=mcb3LUzMHb2iyou8NGU264Y63DQQK0ERp59RX8U4YRHypCPO2s7oOgoTfLJJikaOTQ yMgheqpXETO78sfpPQ+ts+EqjOFRLE7tF9ahr97kejHGeJM9uZ34OZW3nFKEsbPnRgoF iGUgNmloG8Zj4y4LbXjHCc0cqhgzy2p8cdl3RZXsGSe2U1hCh7eZUA+oR3PtvVrgYA+U 0FQUAKKbuRxDPBIOnNW259qC2Zi+wsJc0KRfenj3NOyK5Yq66yZ/AOwBWB+YSVav6eqO +WGb/fiQjR+p4zED71IaNo8+QEfenRGPrHnonDnV7gVPxx+RfZ1hMl1H99dCVJv+Zrqk N2dA== 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=vkqoLjkHeobC9Na2nR7Vp7qBzX/7In3T1XtEkSY44Kw=; b=WSyrudkqj2jCSG4E1KoX33qtxPhBYQI18iUGB7AwspcUsOn/x1x4wteCqz5EK3tRim Epmcn624jiK0EFuRhxGD74hBJCkTBZWMemwngHV/HAUGwvI4NU+40yub8P5YSApOkZxL jQiUGDaWY710kmjxXEfigyaYhQuOvbFq1MFn5mjXsqZePP2DkIFYf2jr6UODhiNmJCYm XqmaelzXrGtsyf0QBjnhuNZWVvtB4Isc/4DMs2I8Bfd93+KxoH3rByErQVGx/HY1hV+k /8+TI1y6SkWVdbIk6KUckvFJTU5VeIaqocuZCBOlbr5m4AW1xHkQAk8cA7UipVUNL4lD krPQ== X-Gm-Message-State: AOAM533/JTHDS1qvdo9i5AHX2qNutGyShvmsNIVTz1nbrbiO+6lK+ATp sysj9qUh7cHzXPaEanU5CwM= X-Google-Smtp-Source: ABdhPJyeT6QfcMr2iD6Xh3noDkmLSko5grS1Cl7ytuzFKiRsOh37aiUz5Ta3xRNgxuROEUUq6DGlaA== X-Received: by 2002:adf:afe9:: with SMTP id y41mr27816528wrd.56.1589894018220; Tue, 19 May 2020 06:13:38 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l5sm21468911wrr.72.2020.05.19.06.13.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:13:37 -0700 (PDT) From: luca.boccassi@gmail.com To: Andrew Rybchenko Cc: dpdk stable Date: Tue, 19 May 2020 14:04:42 +0100 Message-Id: <20200519130549.112823-147-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc/base: fix build when EVB is enabled' 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/21/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 e399ff6427a992e46484a73f0ae6576b37314939 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Tue, 28 Apr 2020 14:37:26 +0100 Subject: [PATCH] net/sfc/base: fix build when EVB is enabled [ upstream commit afff2aa3e34ea4c739327d71ab14a7b754a14483 ] Make local MCDI helper functions static. Fixes: f0bda0cd680d ("net/sfc/base: add MCDI wrappers for vPort and vSwitch in EVB") Fixes: ea94d14dbea0 ("net/sfc/base: provide APIs to configure and reset vPort") Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/base/ef10_evb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/sfc/base/ef10_evb.c b/drivers/net/sfc/base/ef10_evb.c index c26cada5da..9b33e89fc1 100644 --- a/drivers/net/sfc/base/ef10_evb.c +++ b/drivers/net/sfc/base/ef10_evb.c @@ -27,7 +27,7 @@ ef10_evb_fini( EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp)); } - __checkReturn efx_rc_t +static __checkReturn efx_rc_t efx_mcdi_vswitch_alloc( __in efx_nic_t *enp, __in efx_vport_id_t vport_id, @@ -94,7 +94,7 @@ fail1: return (rc); } - __checkReturn efx_rc_t +static __checkReturn efx_rc_t efx_mcdi_vswitch_free( __in efx_nic_t *enp) { @@ -125,7 +125,7 @@ fail1: return (rc); } - __checkReturn efx_rc_t +static __checkReturn efx_rc_t efx_mcdi_vport_alloc( __in efx_nic_t *enp, __in efx_vport_type_t vport_type, @@ -188,7 +188,7 @@ fail1: return (rc); } - __checkReturn efx_rc_t +static __checkReturn efx_rc_t efx_mcdi_vport_free( __in efx_nic_t *enp, __in efx_vport_id_t vport_id) @@ -219,7 +219,7 @@ fail1: return (rc); } - __checkReturn efx_rc_t +static __checkReturn efx_rc_t efx_mcdi_vport_mac_addr_add( __in efx_nic_t *enp, __in efx_vport_id_t vport_id, @@ -254,7 +254,7 @@ fail1: return (rc); } - __checkReturn efx_rc_t +static __checkReturn efx_rc_t efx_mcdi_vport_mac_addr_del( __in efx_nic_t *enp, __in efx_vport_id_t vport_id, @@ -289,7 +289,7 @@ fail1: return (rc); } - __checkReturn efx_rc_t +static __checkReturn efx_rc_t efx_mcdi_port_assign( __in efx_nic_t *enp, __in efx_vport_id_t vport_id, @@ -326,7 +326,7 @@ fail1: return (rc); } - __checkReturn efx_rc_t +static __checkReturn efx_rc_t efx_mcdi_vport_reconfigure( __in efx_nic_t *enp, __in efx_vport_id_t vport_id, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:50.442338789 +0100 +++ 0147-net-sfc-base-fix-build-when-EVB-is-enabled.patch 2020-05-19 14:04:44.472653013 +0100 @@ -1,13 +1,14 @@ -From afff2aa3e34ea4c739327d71ab14a7b754a14483 Mon Sep 17 00:00:00 2001 +From e399ff6427a992e46484a73f0ae6576b37314939 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Tue, 28 Apr 2020 14:37:26 +0100 Subject: [PATCH] net/sfc/base: fix build when EVB is enabled +[ upstream commit afff2aa3e34ea4c739327d71ab14a7b754a14483 ] + Make local MCDI helper functions static. Fixes: f0bda0cd680d ("net/sfc/base: add MCDI wrappers for vPort and vSwitch in EVB") Fixes: ea94d14dbea0 ("net/sfc/base: provide APIs to configure and reset vPort") -Cc: stable@dpdk.org Signed-off-by: Andrew Rybchenko --- @@ -15,7 +16,7 @@ 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/sfc/base/ef10_evb.c b/drivers/net/sfc/base/ef10_evb.c -index d541db4980..aeeaa5189f 100644 +index c26cada5da..9b33e89fc1 100644 --- a/drivers/net/sfc/base/ef10_evb.c +++ b/drivers/net/sfc/base/ef10_evb.c @@ -27,7 +27,7 @@ ef10_evb_fini(