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 38A44A0518 for ; Fri, 24 Jul 2020 14:11:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2F7241C20A; Fri, 24 Jul 2020 14:11:22 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id B5DB21C243 for ; Fri, 24 Jul 2020 14:11:20 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id o8so7759595wmh.4 for ; Fri, 24 Jul 2020 05:11:20 -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=OKhWwc0iun3sqaQRZtugJstlsli6dOWzlS1YHRqaFXM=; b=KFjjx4ein+16D9PpZVQY0SaDzC2yYdfgW8vZKfxo4cJZ7O1lN7uJmc8DpFPNgKf4Ml QnLrTPAuTRF4BkeSbTRsz56nubX4u2u3EnKc0yEsgu4TEhkXL+GHxNrbWrzLcXS1eYZ/ LDMF6G0GqB+rZDpfgl9LBiASZU9SQdQB44oxV4Mqtumf24RxkB58cd0PW+uNmcNRwB/9 2hU52JhSxAdkcCKpLAkgEfjL+erXNj6vNC6RUOKdwZNZ9AjqGbyOJZm2Q8pWtgNNqyYY qZnh7Su6VVRrJTZ3UbCHnw+FgT03y6h8UoVyfq3rQTxksH8eCjCsTouD8mHE3FLYwiDN /Lqg== 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=OKhWwc0iun3sqaQRZtugJstlsli6dOWzlS1YHRqaFXM=; b=Hzu4l9Be8pJohs2eqU+l5gU8r9f0He9UPlOlKbuhSLkWTsD6J6yjTHuRvEVdSYMxjT 0lMRJ1WL3v+ss428w4Ar/55sFY/g9e4O0w/lZn2mMtD28os3SW83avECSjSwFaTb1u5e eaqYyJVlp14s6q8L5+u+N52qOrRUoEdEOETioQxOwed4P5wLq4tm29uxS4Uv70dkQET7 pIqAoNLrAx5svsa3wGkQ4g+Cuak+cbOLyeduVeIHSgfSP7/4CBWpTsPaejSp722mh08o 7fJptm1eBIhQrjaZBdN3m6dB72lrlCgOAF+DWjtvOhvGJffjKC7YxjFIwk9mxc+fWe0c LrrQ== X-Gm-Message-State: AOAM530nozCVa2aguCFcWcGbRdMKaNfQ0UuiL30nCIcaktf6q+bScGr0 UrPP/0y9qWGP4v4rs8j+3TOpNfI4fxRTRw== X-Google-Smtp-Source: ABdhPJyN2KtDdHQiw8fhzVbXI0HZhHBM76vMm0YrD8nlWEk1uqUPK6t7oltQxM7Ijus7VoXAbMXSqQ== X-Received: by 2002:a1c:e910:: with SMTP id q16mr8628791wmc.188.1595592680512; Fri, 24 Jul 2020 05:11:20 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j5sm6719559wmb.15.2020.07.24.05.11.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:11:19 -0700 (PDT) From: luca.boccassi@gmail.com To: Dongyang Pan <197020236@qq.com> Cc: Wei Hu , dpdk stable Date: Fri, 24 Jul 2020 13:00:05 +0100 Message-Id: <20200724120030.1863487-167-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: delete redundant code' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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 2ac0580bcb2c757bd54cf0e2c3252781660368a4 Mon Sep 17 00:00:00 2001 From: Dongyang Pan <197020236@qq.com> Date: Sat, 4 Jul 2020 09:15:26 +0800 Subject: [PATCH] net/bonding: delete redundant code [ upstream commit 2db4cf9d01c5920be0397e5c7aba61779c997753 ] The function valid_bonded_port_id() has already contains function rte_eth_dev_is_valid_port(), so delete redundant check. Fixes: 588ae95e7983 ("net/bonding: fix port ID check") Signed-off-by: Dongyang Pan <197020236@qq.com> Reviewed-by: Wei Hu (Xavier) --- drivers/net/bonding/rte_eth_bond_8023ad.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c index 3991825ad..b24a44686 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -1676,9 +1676,6 @@ rte_eth_bond_8023ad_dedicated_queues_enable(uint16_t port) dev = &rte_eth_devices[port]; internals = dev->data->dev_private; - if (check_for_bonded_ethdev(dev) != 0) - return -1; - if (bond_8023ad_slow_pkt_hw_filter_supported(port) != 0) return -1; @@ -1705,9 +1702,6 @@ rte_eth_bond_8023ad_dedicated_queues_disable(uint16_t port) dev = &rte_eth_devices[port]; internals = dev->data->dev_private; - if (check_for_bonded_ethdev(dev) != 0) - return -1; - /* Device must be stopped to set up slow queue */ if (dev->data->dev_started) return -1; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:55.007550473 +0100 +++ 0167-net-bonding-delete-redundant-code.patch 2020-07-24 12:53:48.563011602 +0100 @@ -1,13 +1,14 @@ -From 2db4cf9d01c5920be0397e5c7aba61779c997753 Mon Sep 17 00:00:00 2001 +From 2ac0580bcb2c757bd54cf0e2c3252781660368a4 Mon Sep 17 00:00:00 2001 From: Dongyang Pan <197020236@qq.com> Date: Sat, 4 Jul 2020 09:15:26 +0800 Subject: [PATCH] net/bonding: delete redundant code +[ upstream commit 2db4cf9d01c5920be0397e5c7aba61779c997753 ] + The function valid_bonded_port_id() has already contains function rte_eth_dev_is_valid_port(), so delete redundant check. Fixes: 588ae95e7983 ("net/bonding: fix port ID check") -Cc: stable@dpdk.org Signed-off-by: Dongyang Pan <197020236@qq.com> Reviewed-by: Wei Hu (Xavier)