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 DA7E0A04DD for ; Wed, 18 Nov 2020 17:37:17 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CEFBD4C90; Wed, 18 Nov 2020 17:37:16 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 3E1664C90 for ; Wed, 18 Nov 2020 17:37:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717432; 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=KOq0Yx5unXw0323st5Txcp014TB98SWQJyQbzvQ0XGk=; b=QzXkwlrUIBZDL1cD3dY3JLT2wXZmT5sW0YHl8K2hnndr+HuWgVz+4prNWC6Wkq0tHELExf IcF2fa40PLy44p5dPClKxUwbDuRbuFfKNG4esYnJH3QOvTxMi8269henYR6aZ63I2JVvQB FELtSBBNAHrN6GIQfizSPjH1tPzLvXI= 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-565-XENC9_m0PY-CYw3VNtQWCA-1; Wed, 18 Nov 2020 11:37:10 -0500 X-MC-Unique: XENC9_m0PY-CYw3VNtQWCA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1ADB7884DD4; Wed, 18 Nov 2020 16:36:38 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id D11905C1A3; Wed, 18 Nov 2020 16:36:36 +0000 (UTC) From: Kevin Traynor To: Dongsheng Rong Cc: RongQing Li , Wei Hu , dpdk stable Date: Wed, 18 Nov 2020 16:34:57 +0000 Message-Id: <20201118163558.1101823-11-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/bonding: fix Rx queue conversion' has been queued to LTS release 18.11.11 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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/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/9b2c6132a35ff1126f4b852e17e852f33cd6c835 Thanks. Kevin. --- >From 9b2c6132a35ff1126f4b852e17e852f33cd6c835 Mon Sep 17 00:00:00 2001 From: Dongsheng Rong Date: Tue, 22 Sep 2020 18:29:32 +0800 Subject: [PATCH] net/bonding: fix Rx queue conversion [ upstream commit 99fb0a03fd1e4ce2ea839014a5d0df87a1282405 ] In 'bond_ethdev_rx_burst_alb()' in Rx path, 'bond_rx_queue' should be used, not 'bond_tx_queue'. Fixes: 06fe78b98ccd ("bond: add mode 6") Signed-off-by: Dongsheng Rong Signed-off-by: RongQing Li Reviewed-by: Wei Hu (Xavier) --- drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 340bee3bb9..65da4b39a8 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -509,6 +509,6 @@ static uint16_t bond_ethdev_rx_burst_alb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) { - struct bond_tx_queue *bd_tx_q = (struct bond_tx_queue *)queue; - struct bond_dev_private *internals = bd_tx_q->dev_private; + struct bond_rx_queue *bd_rx_q = (struct bond_rx_queue *)queue; + struct bond_dev_private *internals = bd_rx_q->dev_private; struct ether_hdr *eth_h; uint16_t ether_type, offset; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:38.195630573 +0000 +++ 0011-net-bonding-fix-Rx-queue-conversion.patch 2020-11-18 16:33:37.914215052 +0000 @@ -1 +1 @@ -From 99fb0a03fd1e4ce2ea839014a5d0df87a1282405 Mon Sep 17 00:00:00 2001 +From 9b2c6132a35ff1126f4b852e17e852f33cd6c835 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 99fb0a03fd1e4ce2ea839014a5d0df87a1282405 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 05ac25fcad..1c404b2edd 100644 +index 340bee3bb9..65da4b39a8 100644 @@ -23 +24 @@ -@@ -535,6 +535,6 @@ static uint16_t +@@ -509,6 +509,6 @@ static uint16_t @@ -30 +31 @@ - struct rte_ether_hdr *eth_h; + struct ether_hdr *eth_h;