From patchwork Wed Mar 7 05:46:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 145158 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B17B6B6F9D for ; Wed, 7 Mar 2012 16:46:51 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751697Ab2CGFqt (ORCPT ); Wed, 7 Mar 2012 00:46:49 -0500 Received: from mail-tul01m020-f174.google.com ([209.85.214.174]:54004 "EHLO mail-tul01m020-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317Ab2CGFqs (ORCPT ); Wed, 7 Mar 2012 00:46:48 -0500 Received: by obbuo6 with SMTP id uo6so6436916obb.19 for ; Tue, 06 Mar 2012 21:46:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:content-type:x-mailer :content-transfer-encoding:mime-version; bh=nNiDyTZv6g9EItC0vtmeEWFcF2a+G4kV2V54nQYK3wU=; b=ssFsTGqbb1bklQ+JlFgLNYiUwUvax/zwkj2KallrZD6C5FexFPUd01bdb4syinbXK6 qvt069YeG+9tGWXBoBJAAewG0kjwCP/L8MvSTrNwBXrUfbTpzV7yYqqx7kPZHnc8gqzZ j9mkux2h2H1uTe0bsJ0MVMWHdh7fD2i883CA3RaTXlAxgqxQ3XT1spa4lmypwYeFzjrQ 2BY3MVH5poyyMrcOQcilm9xafrfK2HFyoXrN2i+0z7v2RM1GMFOXiUGCnpo86rc1+jm+ AiqXDdyn50egNCmzEK8vBOfhZF2+Pyeldf5+6PtnxqiU+sPk+lw3Fqrgj1cl+c80whKK 4yrg== Received: by 10.182.41.6 with SMTP id b6mr337515obl.10.1331099207871; Tue, 06 Mar 2012 21:46:47 -0800 (PST) Received: from [10.0.0.2] (c-107-3-167-36.hsd1.ca.comcast.net. [107.3.167.36]) by mx.google.com with ESMTPS id y18sm20543176obq.21.2012.03.06.21.46.46 (version=SSLv3 cipher=OTHER); Tue, 06 Mar 2012 21:46:46 -0800 (PST) Message-ID: <1331099201.2474.59.camel@edumazet-laptop> Subject: [PATCH] ehea: restore multicast and rx_errors fields From: Eric Dumazet To: David Miller Cc: netdev , Anton Blanchard , Thadeu Lima de Souza Cascardo Date: Tue, 06 Mar 2012 21:46:41 -0800 X-Mailer: Evolution 3.2.2- Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 239c562c94d (ehea: Add 64bit statistics) added a regression, since we no longer report multicast & rx_errors fields, taken from port->stats structure. These fields are updated in ehea_update_stats() every second. Signed-off-by: Eric Dumazet Cc: Anton Blanchard Cc: Thadeu Lima de Souza Cascardo Acked-by: Thadeu Lima de Souza Cascardo Tested-by: Thadeu Lima de Souza Cascardo --- drivers/net/ethernet/ibm/ehea/ehea_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 5d5fb26..e6893cd 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c @@ -336,7 +336,9 @@ static struct rtnl_link_stats64 *ehea_get_stats64(struct net_device *dev, stats->tx_bytes = tx_bytes; stats->rx_packets = rx_packets; - return &port->stats; + stats->multicast = port->stats.multicast; + stats->rx_errors = port->stats.rx_errors; + return stats; } static void ehea_update_stats(struct work_struct *work)