[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, 2 insertions, 18 deletions

diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 448e618b6974..15949d3df17e 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -40,7 +40,6 @@
 
 #define TX_Q_LIMIT    32
 struct ifb_private {
-        struct net_device_stats stats;
         struct tasklet_struct   ifb_tasklet;
         int     tasklet_pending;
         /* mostly debug stats leave in for now */
@@ -61,7 +60,6 @@ static int numifbs = 2;
 
 static void ri_tasklet(unsigned long dev);
 static int ifb_xmit(struct sk_buff *skb, struct net_device *dev);
-static struct net_device_stats *ifb_get_stats(struct net_device *dev);
 static int ifb_open(struct net_device *dev);
 static int ifb_close(struct net_device *dev);
 
@@ -70,7 +68,7 @@ static void ri_tasklet(unsigned long dev)
 
         struct net_device *_dev = (struct net_device *)dev;
         struct ifb_private *dp = netdev_priv(_dev);
-        struct net_device_stats *stats = &dp->stats;
+        struct net_device_stats *stats = &_dev->stats;
         struct sk_buff *skb;
 
         dp->st_task_enter++;
@@ -140,7 +138,6 @@ resched:
 static void ifb_setup(struct net_device *dev)
 {
         /* Initialize the device structure. */
-        dev->get_stats = ifb_get_stats;
         dev->hard_start_xmit = ifb_xmit;
         dev->open = &ifb_open;
         dev->stop = &ifb_close;
@@ -158,7 +155,7 @@ static void ifb_setup(struct net_device *dev)
 static int ifb_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct ifb_private *dp = netdev_priv(dev);
-        struct net_device_stats *stats = &dp->stats;
+        struct net_device_stats *stats = &dev->stats;
         int ret = 0;
         u32 from = G_TC_FROM(skb->tc_verd);
 
@@ -185,19 +182,6 @@ static int ifb_xmit(struct sk_buff *skb, struct net_device *dev)
         return ret;
 }
 
-static struct net_device_stats *ifb_get_stats(struct net_device *dev)
-{
-        struct ifb_private *dp = netdev_priv(dev);
-        struct net_device_stats *stats = &dp->stats;
-
-        pr_debug("tasklets stats %ld:%ld:%ld:%ld:%ld:%ld:%ld:%ld:%ld \n",
-                dp->st_task_enter, dp->st_txq_refl_try, dp->st_rxq_enter,
-                dp->st_rx2tx_tran, dp->st_rxq_notenter, dp->st_rx_frm_egr,
-                dp->st_rx_frm_ing, dp->st_rxq_check, dp->st_rxq_rsch);
-
-        return stats;
-}
-
 static int ifb_close(struct net_device *dev)
 {
         struct ifb_private *dp = netdev_priv(dev);