[<prev] [next>] [day] [month] [year] [list]
Message-ID: <12611648334164@kroah.org>
Date: Fri, 18 Dec 2009 11:33:53 -0800
From: <gregkh@...e.de>
To: randy.dunlap@...cle.com, gregkh@...e.de,
linux-kernel@...r.kernel.org, sfr@...b.auug.org.au
Subject: patch staging-slicoss-use-dev-stats-rather-than-adapter-stats.patch added to gregkh-2.6 tree
This is a note to let you know that I've just added the patch titled
Subject: staging: slicoss Use dev->stats rather than adapter->stats.
to my gregkh-2.6 tree. Its filename is
staging-slicoss-use-dev-stats-rather-than-adapter-stats.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
>From kirjanov@...il.com Fri Dec 18 10:33:54 2009
From: "Denis Kirjanov <kirjanov@...il.com" <kirjanov@...il.com>
Date: Fri, 18 Dec 2009 10:57:45 +0300
Subject: staging: slicoss Use dev->stats rather than adapter->stats.
To: gregkh@...e.de, liodot@...il.com, charrer@...critech.com
Cc: devel@...uxdriverproject.org
Message-ID: <20091218075745.GA4519@...dcone>
Content-Disposition: inline
Use dev->stats rather than adapter->stats.
Signed-off-by: Denis Kirjanov <kirjanov@...il.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
drivers/staging/slicoss/slicoss.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -1230,21 +1230,20 @@ static void slic_init_cleanup(struct ada
static struct net_device_stats *slic_get_stats(struct net_device *dev)
{
struct adapter *adapter = netdev_priv(dev);
- struct net_device_stats *stats;
ASSERT(adapter);
- stats = &adapter->stats;
- stats->collisions = adapter->slic_stats.iface.xmit_collisions;
- stats->rx_errors = adapter->slic_stats.iface.rcv_errors;
- stats->tx_errors = adapter->slic_stats.iface.xmt_errors;
- stats->rx_missed_errors = adapter->slic_stats.iface.rcv_discards;
- stats->tx_heartbeat_errors = 0;
- stats->tx_aborted_errors = 0;
- stats->tx_window_errors = 0;
- stats->tx_fifo_errors = 0;
- stats->rx_frame_errors = 0;
- stats->rx_length_errors = 0;
- return &adapter->stats;
+ dev->stats.collisions = adapter->slic_stats.iface.xmit_collisions;
+ dev->stats.rx_errors = adapter->slic_stats.iface.rcv_errors;
+ dev->stats.tx_errors = adapter->slic_stats.iface.xmt_errors;
+ dev->stats.rx_missed_errors = adapter->slic_stats.iface.rcv_discards;
+ dev->stats.tx_heartbeat_errors = 0;
+ dev->stats.tx_aborted_errors = 0;
+ dev->stats.tx_window_errors = 0;
+ dev->stats.tx_fifo_errors = 0;
+ dev->stats.rx_frame_errors = 0;
+ dev->stats.rx_length_errors = 0;
+
+ return &dev->stats;
}
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists