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 45871A04B1 for ; Fri, 28 Aug 2020 12:13:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3B876A3; Fri, 28 Aug 2020 12:13:54 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 20F3DA3 for ; Fri, 28 Aug 2020 12:13:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FJjp2RLYX5Q6ftgRvbu3Pp9dsUl4c+//VjKeyUe11F0=; b=JzDVHcIeYUmp6+Xi3bDuUVKYxDlWeTDN8GC0usEC3uap42AM0wMKs9p8OpIDf91cAI40D+ P2czcmKR6aoXvaBOV7e9cOMWSzr+EPTTRyrrfRd/8yWQuBKe6LRTG+0HNGw1YlHu9bJr8J J3Ik11HOi94QFe12he3I+lLMyhC0UC0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-176-Hw-jd1dJPdGuHrkWFCf_yg-1; Fri, 28 Aug 2020 06:13:48 -0400 X-MC-Unique: Hw-jd1dJPdGuHrkWFCf_yg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDCDC10066FB; Fri, 28 Aug 2020 10:13:47 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE44B19D7C; Fri, 28 Aug 2020 10:13:46 +0000 (UTC) From: Kevin Traynor To: Dongyang Pan <197020236@qq.com> Cc: Wei Hu , dpdk stable Date: Fri, 28 Aug 2020 11:12:36 +0100 Message-Id: <20200828101308.223767-10-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: delete redundant code' has been queued to LTS release 18.11.10 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 LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/02/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/67e9387958dc50c6673a27e131979f625b4dab11 Thanks. Kevin. --- >From 67e9387958dc50c6673a27e131979f625b4dab11 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 99884c0049..b0f94d168b 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -1590,7 +1590,4 @@ rte_eth_bond_8023ad_dedicated_queues_enable(uint16_t 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; @@ -1619,7 +1616,4 @@ rte_eth_bond_8023ad_dedicated_queues_disable(uint16_t 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) -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.221819890 +0100 +++ 0010-net-bonding-delete-redundant-code.patch 2020-08-28 11:03:25.934955541 +0100 @@ -1 +1 @@ -From 2db4cf9d01c5920be0397e5c7aba61779c997753 Mon Sep 17 00:00:00 2001 +From 67e9387958dc50c6673a27e131979f625b4dab11 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2db4cf9d01c5920be0397e5c7aba61779c997753 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 3991825ad9..b24a446862 100644 +index 99884c0049..b0f94d168b 100644 @@ -22 +23 @@ -@@ -1677,7 +1677,4 @@ rte_eth_bond_8023ad_dedicated_queues_enable(uint16_t port) +@@ -1590,7 +1590,4 @@ rte_eth_bond_8023ad_dedicated_queues_enable(uint16_t port) @@ -30 +31 @@ -@@ -1706,7 +1703,4 @@ rte_eth_bond_8023ad_dedicated_queues_disable(uint16_t port) +@@ -1619,7 +1616,4 @@ rte_eth_bond_8023ad_dedicated_queues_disable(uint16_t port)