From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 39490A0A02 for ; Mon, 17 May 2021 18:17:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2FF3840041; Mon, 17 May 2021 18:17:21 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id BBA3640041 for ; Mon, 17 May 2021 18:17:20 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifvk-0008Vy-HO; Mon, 17 May 2021 16:17:20 +0000 From: Christian Ehrhardt To: Kalesh AP Cc: Ajit Khaparde , Lance Richardson , dpdk stable Date: Mon, 17 May 2021 18:10:00 +0200 Message-Id: <20210517161039.3132619-171-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: remove unnecessary forward declarations' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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.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 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/ad2ed1c588c70e9210c387c4472c753439cc8f60 Thanks. Christian Ehrhardt --- >From ad2ed1c588c70e9210c387c4472c753439cc8f60 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 22 Apr 2021 09:42:00 +0530 Subject: [PATCH] net/bnxt: remove unnecessary forward declarations [ upstream commit b3577e2aa6a1cd307d8ecc82a0df7c517d1f66d0 ] This patch removes several redundant forward declarations of functions and structure. Fixes: 0b42b92ae429 ("net/bnxt: fix xstats by id") Fixes: cf4f055a6578 ("net/bnxt: remove EEM system memory support") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Lance Richardson --- drivers/net/bnxt/bnxt_stats.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_stats.h b/drivers/net/bnxt/bnxt_stats.h index 3cf2a1b822..7e11efe841 100644 --- a/drivers/net/bnxt/bnxt_stats.h +++ b/drivers/net/bnxt/bnxt_stats.h @@ -18,11 +18,6 @@ int bnxt_dev_xstats_get_names_op(__rte_unused struct rte_eth_dev *eth_dev, int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev, struct rte_eth_xstat *xstats, unsigned int n); int bnxt_dev_xstats_reset_op(struct rte_eth_dev *eth_dev); -int bnxt_dev_xstats_get_by_id_op(struct rte_eth_dev *dev, const uint64_t *ids, - uint64_t *values, unsigned int limit); -int bnxt_dev_xstats_get_names_by_id_op(struct rte_eth_dev *dev, - struct rte_eth_xstat_name *xstats_names, - const uint64_t *ids, unsigned int limit); struct bnxt_xstats_name_off { char name[RTE_ETH_XSTATS_NAME_SIZE]; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:36.093860643 +0200 +++ 0171-net-bnxt-remove-unnecessary-forward-declarations.patch 2021-05-17 17:40:29.495812029 +0200 @@ -1 +1 @@ -From b3577e2aa6a1cd307d8ecc82a0df7c517d1f66d0 Mon Sep 17 00:00:00 2001 +From ad2ed1c588c70e9210c387c4472c753439cc8f60 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b3577e2aa6a1cd307d8ecc82a0df7c517d1f66d0 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -17,2 +17,0 @@ - drivers/net/bnxt/bnxt.h | 8 -------- - drivers/net/bnxt/bnxt_hwrm.h | 1 - @@ -20 +19 @@ - 3 files changed, 14 deletions(-) + 1 file changed, 5 deletions(-) @@ -22,38 +20,0 @@ -diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h -index dfdfa9f7a0..bd2dec4d63 100644 ---- a/drivers/net/bnxt/bnxt.h -+++ b/drivers/net/bnxt/bnxt.h -@@ -597,13 +597,6 @@ struct bnxt_rep_info { - DEV_RX_OFFLOAD_SCATTER | \ - DEV_RX_OFFLOAD_RSS_HASH) - --#define MAX_TABLE_SUPPORT 4 --#define MAX_DIR_SUPPORT 2 --struct bnxt_dmabuf_info { -- uint32_t entry_num; -- int fd[MAX_DIR_SUPPORT][MAX_TABLE_SUPPORT]; --}; -- - #define BNXT_HWRM_SHORT_REQ_LEN sizeof(struct hwrm_short_input) - - struct bnxt_flow_stat_info { -@@ -834,7 +827,6 @@ struct bnxt { - uint16_t port_svif; - - struct tf tfp; -- struct bnxt_dmabuf_info dmabuf; - struct bnxt_ulp_context *ulp_ctx; - struct bnxt_flow_stat_info *flow_stat; - uint16_t max_num_kflows; -diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h -index 0c2e32ccbf..d9771eabd3 100644 ---- a/drivers/net/bnxt/bnxt_hwrm.h -+++ b/drivers/net/bnxt/bnxt_hwrm.h -@@ -294,7 +294,6 @@ int bnxt_hwrm_get_dflt_vnic_svif(struct bnxt *bp, uint16_t fid, - uint16_t *vnic_id, uint16_t *svif); - int bnxt_hwrm_parent_pf_qcfg(struct bnxt *bp); - int bnxt_hwrm_port_phy_qcaps(struct bnxt *bp); --int bnxt_hwrm_oem_cmd(struct bnxt *bp, uint32_t entry_num); - int bnxt_clear_one_vnic_filter(struct bnxt *bp, - struct bnxt_filter_info *filter); - void bnxt_free_vf_info(struct bnxt *bp); @@ -61 +22 @@ -index 0ee226901a..e9e5636926 100644 +index 3cf2a1b822..7e11efe841 100644