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 355CDA0093 for ; Thu, 28 May 2020 18:24:43 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 115AB1DC23; Thu, 28 May 2020 18:24:43 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 910CA1D996 for ; Thu, 28 May 2020 18:24:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683081; 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=lE3Y0aUjDAp6y8z631O3odf9T//JAmDgf4SKyJYKqpA=; b=FmgwnFXY0bRPen6+nMK0AD2dyON23RaTL4fTYj4zR8BLnhkNvx+8ywiv3zGk2LBMbx3WtY nJPyLfNQKuASnFos3qPo2MX0c1z2rXBAX8oNkwJ8A4EQ4b+Y/tk1X0PgilZ0fubn5Li6cQ U5pf/Gsh7/h6rkXuRTUXO9J1Hv2CQVw= 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-42-9Dq3PFTIOVeKzSXf2j1Qgw-1; Thu, 28 May 2020 12:24:35 -0400 X-MC-Unique: 9Dq3PFTIOVeKzSXf2j1Qgw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 679CC80183C; Thu, 28 May 2020 16:24:34 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 832F760C87; Thu, 28 May 2020 16:24:33 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Thu, 28 May 2020 17:22:02 +0100 Message-Id: <20200528162322.7863-15-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ethdev: fix spelling' has been queued to LTS release 18.11.9 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.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 06/03/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/599771af0bb607f6bf0a8f41f004d058cf3c4345 Thanks. Kevin. --- >From 599771af0bb607f6bf0a8f41f004d058cf3c4345 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 10 Mar 2020 09:24:05 -0700 Subject: [PATCH] ethdev: fix spelling [ upstream commit 897358cc1e61e950b8e6a1755c6b998f697b0ab9 ] Minor spelling errors found by aspell and codespell Fixes: 1daa33805824 ("ethdev: validate offloads set by PMD") Fixes: 81f9db8ecc2c ("ethdev: add vlan offload support") Fixes: c8231c63ddcb ("ethdev: insert Rx callback as head of list") Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- lib/librte_ethdev/rte_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 13866150ef..2929d10c22 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -2706,5 +2706,5 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) orig_offloads = dev->data->dev_conf.rxmode.offloads; - /*check which option changed by application*/ + /* check which option changed by application */ cur = !!(offload_mask & ETH_VLAN_STRIP_OFFLOAD); org = !!(dev->data->dev_conf.rxmode.offloads & @@ -3862,5 +3862,5 @@ rte_eth_add_first_rx_callback(uint16_t port_id, uint16_t queue_id, rte_spinlock_lock(&rte_eth_rx_cb_lock); - /* Add the callbacks at fisrt position*/ + /* Add the callbacks at first position */ cb->next = rte_eth_devices[port_id].post_rx_burst_cbs[queue_id]; rte_smp_wmb(); -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:12:59.956386151 +0100 +++ 0015-ethdev-fix-spelling.patch 2020-05-28 17:12:59.060557328 +0100 @@ -1 +1 @@ -From 897358cc1e61e950b8e6a1755c6b998f697b0ab9 Mon Sep 17 00:00:00 2001 +From 599771af0bb607f6bf0a8f41f004d058cf3c4345 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 897358cc1e61e950b8e6a1755c6b998f697b0ab9 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16,2 +17,2 @@ - lib/librte_ethdev/rte_ethdev.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + lib/librte_ethdev/rte_ethdev.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) @@ -20 +21 @@ -index 774c721b34..0854ef8832 100644 +index 13866150ef..2929d10c22 100644 @@ -23,23 +24,2 @@ -@@ -1165,5 +1165,5 @@ check_lro_pkt_size(uint16_t port_id, uint32_t config_size, - /* - * Validate offloads that are requested through rte_eth_dev_configure against -- * the offloads successfuly set by the ethernet device. -+ * the offloads successfully set by the ethernet device. - * - * @param port_id -@@ -1172,5 +1172,5 @@ check_lro_pkt_size(uint16_t port_id, uint32_t config_size, - * The offloads that have been requested through `rte_eth_dev_configure`. - * @param set_offloads -- * The offloads successfuly set by the ethernet device. -+ * The offloads successfully set by the ethernet device. - * @param offload_type - * The offload type i.e. Rx/Tx string. -@@ -1201,5 +1201,5 @@ validate_offloads(uint16_t port_id, uint64_t req_offloads, - } - -- /* Chech if offload couldn't be disabled. */ -+ /* Check if offload couldn't be disabled. */ - if (offload & set_offloads) { - RTE_ETHDEV_LOG(DEBUG, -@@ -3262,5 +3262,5 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) - dev_offloads = orig_offloads; +@@ -2706,5 +2706,5 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) + orig_offloads = dev->data->dev_conf.rxmode.offloads; @@ -50,2 +30,2 @@ - org = !!(dev_offloads & DEV_RX_OFFLOAD_VLAN_STRIP); -@@ -4453,5 +4453,5 @@ rte_eth_add_first_rx_callback(uint16_t port_id, uint16_t queue_id, + org = !!(dev->data->dev_conf.rxmode.offloads & +@@ -3862,5 +3862,5 @@ rte_eth_add_first_rx_callback(uint16_t port_id, uint16_t queue_id,