[NET] drivers/net: statistics cleanup #1 -- save memory and shrink code

We now have struct net_device_stats embedded in struct net_device,
and the default ->get_stats() hook does the obvious thing for us.

Run through drivers/net/* and remove the driver-local storage of
statistics, and driver-local ->get_stats() hook where applicable.

This was just the low-hanging fruit in drivers/net; plenty more drivers
remain to be updated.

[ Resolved conflicts with napi_struct changes and fix sunqe build
  regression... -DaveM ]

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 13 deletions

diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c
index 6fee405d8403..eb0aff787dfd 100644
--- a/drivers/net/netx-eth.c
+++ b/drivers/net/netx-eth.c
@@ -97,7 +97,6 @@
 struct netx_eth_priv {
         void                    __iomem *sram_base, *xpec_base, *xmac_base;
         int                     id;
-        struct net_device_stats stats;
         struct mii_if_info      mii;
         u32                     msg_enable;
         struct xc               *xc;
@@ -129,8 +128,8 @@ netx_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                    FIFO_PTR_FRAMELEN(len));
 
         ndev->trans_start = jiffies;
-        priv->stats.tx_packets++;
-        priv->stats.tx_bytes += skb->len;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += skb->len;
 
         netif_stop_queue(ndev);
         spin_unlock_irq(&priv->lock);
@@ -156,7 +155,7 @@ static void netx_eth_receive(struct net_device *ndev)
         if (unlikely(skb == NULL)) {
                 printk(KERN_NOTICE "%s: Low memory, packet dropped.\n",
                         ndev->name);
-                priv->stats.rx_dropped++;
+                dev->stats.rx_dropped++;
                 return;
         }
 
@@ -170,8 +169,8 @@ static void netx_eth_receive(struct net_device *ndev)
         ndev->last_rx = jiffies;
         skb->protocol = eth_type_trans(skb, ndev);
         netif_rx(skb);
-        priv->stats.rx_packets++;
-        priv->stats.rx_bytes += len;
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += len;
 }
 
 static irqreturn_t
@@ -210,12 +209,6 @@ netx_eth_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static struct net_device_stats *netx_eth_query_statistics(struct net_device *ndev)
-{
-        struct netx_eth_priv *priv = netdev_priv(ndev);
-        return &priv->stats;
-}
-
 static int netx_eth_open(struct net_device *ndev)
 {
         struct netx_eth_priv *priv = netdev_priv(ndev);
@@ -323,7 +316,6 @@ static int netx_eth_enable(struct net_device *ndev)
         ndev->hard_start_xmit = netx_eth_hard_start_xmit;
         ndev->tx_timeout = netx_eth_timeout;
         ndev->watchdog_timeo = msecs_to_jiffies(5000);
-        ndev->get_stats = netx_eth_query_statistics;
         ndev->set_multicast_list = netx_eth_set_multicast_list;
 
         priv->msg_enable       = NETIF_MSG_LINK;