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 CC7CBA0A02 for ; Mon, 17 May 2021 18:17:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C50A340041; Mon, 17 May 2021 18:17:12 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 09CD9410E0 for ; Mon, 17 May 2021 18:17:11 +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 1lifvZ-0008UY-1c; Mon, 17 May 2021 16:17:09 +0000 From: Christian Ehrhardt To: Chengwen Feng Cc: Min Hu , Qi Zhang , dpdk stable Date: Mon, 17 May 2021 18:09:55 +0200 Message-Id: <20210517161039.3132619-166-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/i40e: remove redundant VSI check in Tx queue setup' 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/5d83c381faf1e069752f7edbf801c159a352e6df Thanks. Christian Ehrhardt --- >From 5d83c381faf1e069752f7edbf801c159a352e6df Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Wed, 21 Apr 2021 10:33:14 +0800 Subject: [PATCH] net/i40e: remove redundant VSI check in Tx queue setup [ upstream commit 70077b8630011e3cd5d7a2fa9af6ea6e73e46a4d ] The VSI pointer is always valid, so there is no need to judge its validity. Fixes: b6583ee40265 ("i40e: full VMDQ pools support") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) Acked-by: Qi Zhang --- drivers/net/i40e/i40e_rxtx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 352fb426df..4dc828357f 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -2186,8 +2186,6 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev, if (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF) { vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); vsi = &vf->vsi; - if (!vsi) - return -EINVAL; reg_idx = queue_idx; } else { pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:35.914928925 +0200 +++ 0166-net-i40e-remove-redundant-VSI-check-in-Tx-queue-setu.patch 2021-05-17 17:40:29.487811965 +0200 @@ -1 +1 @@ -From 70077b8630011e3cd5d7a2fa9af6ea6e73e46a4d Mon Sep 17 00:00:00 2001 +From 5d83c381faf1e069752f7edbf801c159a352e6df Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 70077b8630011e3cd5d7a2fa9af6ea6e73e46a4d ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 86a9eae370..02cf5e787c 100644 +index 352fb426df..4dc828357f 100644 @@ -23 +24 @@ -@@ -2253,8 +2253,6 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev, +@@ -2186,8 +2186,6 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,