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 3CD00A046B for ; Tue, 23 Jul 2019 03:01:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 335381B998; Tue, 23 Jul 2019 03:01:51 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id C92ED1B998 for ; Tue, 23 Jul 2019 03:01:49 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:01:44 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11Hf2026580; Tue, 23 Jul 2019 04:01:43 +0300 From: Yongseok Koh To: Rami Rosen Cc: Remy Horton , dpdk stable Date: Mon, 22 Jul 2019 17:59:43 -0700 Message-Id: <20190723010115.6446-16-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/ethtool: fix two typos' has been queued to LTS release 17.11.7 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 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. 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. Yongseok --- >From cb1b249d678f27620fb69ccba0f910541b2350d6 Mon Sep 17 00:00:00 2001 From: Rami Rosen Date: Mon, 25 Feb 2019 21:21:37 +0200 Subject: [PATCH] examples/ethtool: fix two typos [ upstream commit ea43e995799aaa7b15914c3e8237e932a854d6b6 ] This patch fixes 2 typos in examples/ethtool: There is no such thing as ethtool_ops::get_driverinfo It should be get_drvinfo: see include/linux/ethtool.h in the kernel tree. rte_net_change_mtu should be ndo_change_mtu: see include/linux/netdevice.h in the kernel tree. Fixes: bda68ab9d1e7 ("examples/ethtool: add user-space ethtool sample application") Signed-off-by: Rami Rosen Acked-by: Remy Horton --- examples/ethtool/lib/rte_ethtool.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/ethtool/lib/rte_ethtool.h b/examples/ethtool/lib/rte_ethtool.h index 1cd8f4d2a3..b58fd558c0 100644 --- a/examples/ethtool/lib/rte_ethtool.h +++ b/examples/ethtool/lib/rte_ethtool.h @@ -38,7 +38,7 @@ * This new interface is designed to provide a user-space shim layer for * Ethtool and Netdevice op API. * - * rte_ethtool_get_driver: ethtool_ops::get_driverinfo + * rte_ethtool_get_driver: ethtool_ops::get_drvinfo * rte_ethtool_get_link: ethtool_ops::get_link * rte_ethtool_get_regs_len: ethtool_ops::get_regs_len * rte_ethtool_get_regs: ethtool_ops::get_regs @@ -52,7 +52,7 @@ * rte_ethtool_net_stop: net_device_ops::ndo_stop * rte_ethtool_net_set_mac_addr: net_device_ops::ndo_set_mac_address * rte_ethtool_net_validate_addr: net_device_ops::ndo_validate_addr - * rte_ethtool_net_change_mtu: net_device_ops::rte_net_change_mtu + * rte_ethtool_net_change_mtu: net_device_ops::ndo_change_mtu * rte_ethtool_net_get_stats64: net_device_ops::ndo_get_stats64 * rte_ethtool_net_vlan_rx_add_vid net_device_ops::ndo_vlan_rx_add_vid * rte_ethtool_net_vlan_rx_kill_vid net_device_ops::ndo_vlan_rx_kill_vid -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:07.389926932 -0700 +++ 0016-examples-ethtool-fix-two-typos.patch 2019-07-22 17:55:05.846468000 -0700 @@ -1,8 +1,10 @@ -From ea43e995799aaa7b15914c3e8237e932a854d6b6 Mon Sep 17 00:00:00 2001 +From cb1b249d678f27620fb69ccba0f910541b2350d6 Mon Sep 17 00:00:00 2001 From: Rami Rosen Date: Mon, 25 Feb 2019 21:21:37 +0200 Subject: [PATCH] examples/ethtool: fix two typos +[ upstream commit ea43e995799aaa7b15914c3e8237e932a854d6b6 ] + This patch fixes 2 typos in examples/ethtool: There is no such thing as ethtool_ops::get_driverinfo @@ -13,7 +15,6 @@ see include/linux/netdevice.h in the kernel tree. Fixes: bda68ab9d1e7 ("examples/ethtool: add user-space ethtool sample application") -Cc: stable@dpdk.org Signed-off-by: Rami Rosen Acked-by: Remy Horton @@ -22,10 +23,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/ethtool/lib/rte_ethtool.h b/examples/ethtool/lib/rte_ethtool.h -index 43adc97a3d..31cd5ae4ef 100644 +index 1cd8f4d2a3..b58fd558c0 100644 --- a/examples/ethtool/lib/rte_ethtool.h +++ b/examples/ethtool/lib/rte_ethtool.h -@@ -9,7 +9,7 @@ +@@ -38,7 +38,7 @@ * This new interface is designed to provide a user-space shim layer for * Ethtool and Netdevice op API. * @@ -34,7 +35,7 @@ * rte_ethtool_get_link: ethtool_ops::get_link * rte_ethtool_get_regs_len: ethtool_ops::get_regs_len * rte_ethtool_get_regs: ethtool_ops::get_regs -@@ -23,7 +23,7 @@ +@@ -52,7 +52,7 @@ * rte_ethtool_net_stop: net_device_ops::ndo_stop * rte_ethtool_net_set_mac_addr: net_device_ops::ndo_set_mac_address * rte_ethtool_net_validate_addr: net_device_ops::ndo_validate_addr