From f38a73187e70f82b896502a3b9965d425d611d3e Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Wed, 7 Oct 2009 03:11:20 -0700 Subject: [PATCH] --- yaml --- r: 170467 b: refs/heads/master c: 78122a52b39c9527fa3a32afbb6572964c17c651 h: refs/heads/master i: 170465: ddec34f923d9031107077671e6ccee32330345f8 170463: ec8b3ba88f2934fdba56810cf9166f74d49a167d v: v3 --- [refs] | 2 +- trunk/drivers/net/benet/be.h | 1 - trunk/drivers/net/benet/be_ethtool.c | 2 +- trunk/drivers/net/benet/be_main.c | 6 ++---- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index dd4e40d4fe89..127ae81d5cff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32953543221cfe2bf0a24205fab225e5b8ed81a0 +refs/heads/master: 78122a52b39c9527fa3a32afbb6572964c17c651 diff --git a/trunk/drivers/net/benet/be.h b/trunk/drivers/net/benet/be.h index a80da0e14a52..4b61a9154222 100644 --- a/trunk/drivers/net/benet/be.h +++ b/trunk/drivers/net/benet/be.h @@ -181,7 +181,6 @@ struct be_drvr_stats { struct be_stats_obj { struct be_drvr_stats drvr_stats; - struct net_device_stats net_stats; struct be_dma_mem cmd; }; diff --git a/trunk/drivers/net/benet/be_ethtool.c b/trunk/drivers/net/benet/be_ethtool.c index 77c66da8738c..333729bd6d92 100644 --- a/trunk/drivers/net/benet/be_ethtool.c +++ b/trunk/drivers/net/benet/be_ethtool.c @@ -234,7 +234,7 @@ be_get_ethtool_stats(struct net_device *netdev, struct be_rxf_stats *rxf_stats = &hw_stats->rxf; struct be_port_rxf_stats *port_stats = &rxf_stats->port[adapter->port_num]; - struct net_device_stats *net_stats = &adapter->stats.net_stats; + struct net_device_stats *net_stats = &netdev->stats; struct be_erx_stats *erx_stats = &hw_stats->erx; void *p = NULL; int i; diff --git a/trunk/drivers/net/benet/be_main.c b/trunk/drivers/net/benet/be_main.c index 6d5e81f7046f..0e92a1f055a2 100644 --- a/trunk/drivers/net/benet/be_main.c +++ b/trunk/drivers/net/benet/be_main.c @@ -141,7 +141,7 @@ void netdev_stats_update(struct be_adapter *adapter) struct be_rxf_stats *rxf_stats = &hw_stats->rxf; struct be_port_rxf_stats *port_stats = &rxf_stats->port[adapter->port_num]; - struct net_device_stats *dev_stats = &adapter->stats.net_stats; + struct net_device_stats *dev_stats = &adapter->netdev->stats; struct be_erx_stats *erx_stats = &hw_stats->erx; dev_stats->rx_packets = port_stats->rx_total_frames; @@ -269,9 +269,7 @@ static void be_rx_eqd_update(struct be_adapter *adapter) static struct net_device_stats *be_get_stats(struct net_device *dev) { - struct be_adapter *adapter = netdev_priv(dev); - - return &adapter->stats.net_stats; + return &dev->stats; } static u32 be_calc_rate(u64 bytes, unsigned long ticks)