From patchwork Fri Jul 9 19:08:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asmaa Mnebhi X-Patchwork-Id: 1503333 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GM2ln45T9z9sWk; Sat, 10 Jul 2021 05:09:41 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m1vsW-0003gj-Qd; Fri, 09 Jul 2021 19:09:36 +0000 Received: from mail-il-dmz.mellanox.com ([193.47.165.129] helo=mellanox.co.il) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m1vrs-0003D2-M9 for kernel-team@lists.ubuntu.com; Fri, 09 Jul 2021 19:08:56 +0000 Received: from Internal Mail-Server by MTLPINE1 (envelope-from asmaa@mellanox.com) with SMTP; 9 Jul 2021 22:08:53 +0300 Received: from farm-0002.mtbu.labs.mlnx (farm-0002.mtbu.labs.mlnx [10.15.2.32]) by mtbu-labmailer.labs.mlnx (8.14.4/8.14.4) with ESMTP id 169J8qBF030223; Fri, 9 Jul 2021 15:08:52 -0400 Received: (from asmaa@localhost) by farm-0002.mtbu.labs.mlnx (8.14.7/8.13.8/Submit) id 169J8qqj005465; Fri, 9 Jul 2021 15:08:52 -0400 From: Asmaa Mnebhi To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PULL][PATCH v2 12/23] Revert "UBUNTU: SAUCE: mlxbf_gige: add support for ndo_get_stats64" Date: Fri, 9 Jul 2021 15:08:19 -0400 Message-Id: <20210709190830.5405-13-asmaa@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210709190830.5405-1-asmaa@nvidia.com> References: <20210709190830.5405-1-asmaa@nvidia.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: asmaa@nvidia.com, davthompson@nvidia.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1934923 This reverts commit 5732076cd8c01a565ebae7fdfb23e4b3536a1ff4. Signed-off-by: Asmaa Mnebhi --- .../mellanox/mlxbf_gige/mlxbf_gige_main.c | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c index a4ac1dc947d0..e488962bd411 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c @@ -19,7 +19,7 @@ #include "mlxbf_gige_regs.h" #define DRV_NAME "mlxbf_gige" -#define DRV_VERSION "1.5" +#define DRV_VERSION "1.4" static void mlxbf_gige_set_mac_rx_filter(struct mlxbf_gige *priv, unsigned int index, u64 dmac) @@ -406,6 +406,7 @@ static void mlxbf_gige_get_ethtool_stats(struct net_device *netdev, u64 *data) { struct mlxbf_gige *priv = netdev_priv(netdev); + unsigned long flags; /* Fill data array with interface statistics * @@ -1009,24 +1010,6 @@ static void mlxbf_gige_set_rx_mode(struct net_device *netdev) } } -static void mlxbf_gige_get_stats64(struct net_device *netdev, - struct rtnl_link_stats64 *stats) -{ - struct mlxbf_gige *priv = netdev_priv(netdev); - - netdev_stats_to_stats64(stats, &netdev->stats); - - stats->rx_length_errors = priv->stats.rx_truncate_errors; - stats->rx_fifo_errors = priv->stats.rx_din_dropped_pkts; - stats->rx_crc_errors = priv->stats.rx_mac_errors; - stats->rx_errors = stats->rx_length_errors + - stats->rx_fifo_errors + - stats->rx_crc_errors; - - stats->tx_fifo_errors = priv->stats.tx_fifo_full; - stats->tx_errors = stats->tx_fifo_errors; -} - static const struct net_device_ops mlxbf_gige_netdev_ops = { .ndo_open = mlxbf_gige_open, .ndo_stop = mlxbf_gige_stop, @@ -1035,7 +1018,6 @@ static const struct net_device_ops mlxbf_gige_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_do_ioctl = mlxbf_gige_do_ioctl, .ndo_set_rx_mode = mlxbf_gige_set_rx_mode, - .ndo_get_stats64 = mlxbf_gige_get_stats64, }; static void mlxbf_gige_initial_mac(struct mlxbf_gige *priv)