From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id E6F1AA0096 for ; Wed, 10 Apr 2019 18:45:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D9EB31B105; Wed, 10 Apr 2019 18:45:36 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id F3C8A1B144 for ; Wed, 10 Apr 2019 18:45:35 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 617A91F566; Wed, 10 Apr 2019 16:45:35 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-94.ams2.redhat.com [10.36.117.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D6E15D962; Wed, 10 Apr 2019 16:45:34 +0000 (UTC) From: Kevin Traynor To: Rami Rosen Cc: Remy Horton , dpdk stable Date: Wed, 10 Apr 2019 17:43:50 +0100 Message-Id: <20190410164411.10546-42-ktraynor@redhat.com> In-Reply-To: <20190410164411.10546-1-ktraynor@redhat.com> References: <20190410164411.10546-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 10 Apr 2019 16:45:35 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/ethtool: fix two typos' has been queued to LTS release 18.11.2 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.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 04/16/19. 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. Thanks. Kevin Traynor --- >From 5e866deb2e415a5bdddef953fd1265fe9066ce22 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 43adc97a3..31cd5ae4e 100644 --- a/examples/ethtool/lib/rte_ethtool.h +++ b/examples/ethtool/lib/rte_ethtool.h @@ -10,5 +10,5 @@ * 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 @@ -24,5 +24,5 @@ * 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 -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-10 14:06:11.129084033 +0100 +++ 0042-examples-ethtool-fix-two-typos.patch 2019-04-10 14:06:07.978291633 +0100 @@ -1,8 +1,10 @@ -From ea43e995799aaa7b15914c3e8237e932a854d6b6 Mon Sep 17 00:00:00 2001 +From 5e866deb2e415a5bdddef953fd1265fe9066ce22 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