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 087C8A0555 for ; Thu, 9 Jun 2022 13:38:46 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0463140220; Thu, 9 Jun 2022 13:38:46 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 7322340220 for ; Thu, 9 Jun 2022 13:38:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774724; 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=3KXeCI2fn3080vWf80v80LmGuUP4VsUgpEjSwT9Ngh8=; b=a8BFSCiuqSFBkrjSZt+oagDtZP4Hzfj2PmrdN+oBXB1gjV5i1Ghd0L21nTyG8KejcLj7SI IVn1mh3LPh9prtofEmm3QQfDZ7Yd8/B4c1mYpEC/8HbPBhXomiArrksoP5JsBwKWdVmiQn BKZYSkTTxaLfwuYbzSOgLUm7C12Q4WM= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-370-HcTFdExmNZuPDEojiT4YNQ-1; Thu, 09 Jun 2022 07:38:43 -0400 X-MC-Unique: HcTFdExmNZuPDEojiT4YNQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C0E1B29AA2EA; Thu, 9 Jun 2022 11:38:42 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0917618EA4; Thu, 9 Jun 2022 11:38:41 +0000 (UTC) From: Kevin Traynor To: Qi Zhang Cc: Radu Nicolau , dpdk stable Subject: patch 'net/iavf: remove dead code' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:55 +0100 Message-Id: <20220609113701.386938-68-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/13/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/149acf1689eefa77836563e867d02ec1da053fd5 Thanks. Kevin --- >From 149acf1689eefa77836563e867d02ec1da053fd5 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 30 May 2022 07:36:29 -0400 Subject: [PATCH] net/iavf: remove dead code [ upstream commit c4716123a1e8ac79eadf57054145e330c9f7ed8b ] Remove unimplemented function call be wrapped by RTE_LIBRTE_IAVF_DEBUG_TX_DESC_RING Fixes: 1e728b01120c ("net/iavf: rework Tx path") Signed-off-by: Qi Zhang Acked-by: Radu Nicolau --- drivers/net/iavf/iavf_rxtx.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 0d380bf80e..70c68d8c4b 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2543,10 +2543,4 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) txe = &txe_ring[desc_idx]; -#ifdef RTE_LIBRTE_IAVF_DEBUG_TX_DESC_RING - iavf_dump_tx_entry_ring(txq); - iavf_dump_tx_desc_ring(txq); -#endif - - for (idx = 0; idx < nb_pkts; idx++) { volatile struct iavf_tx_desc *ddesc; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:31.316761092 +0100 +++ 0068-net-iavf-remove-dead-code.patch 2022-06-09 12:34:29.810980751 +0100 @@ -1 +1 @@ -From c4716123a1e8ac79eadf57054145e330c9f7ed8b Mon Sep 17 00:00:00 2001 +From 149acf1689eefa77836563e867d02ec1da053fd5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c4716123a1e8ac79eadf57054145e330c9f7ed8b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index bb3d7ea434..14d4dbe967 100644 +index 0d380bf80e..70c68d8c4b 100644 @@ -22 +23 @@ -@@ -2661,10 +2661,4 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +@@ -2543,10 +2543,4 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)