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

[deliverable/linux.git] / drivers / net / ibmveth.c

diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 2dff9f2800cdea7aa266c89fe5517364533c46e8..bdbf3dead4e200b97ad73451e7a19b6fbac421d2 100644 (file)
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -87,7 +87,6 @@ static int ibmveth_close(struct net_device *dev);
 static int ibmveth_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
 static int ibmveth_poll(struct napi_struct *napi, int budget);
 static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static struct net_device_stats *ibmveth_get_stats(struct net_device *dev);
 static void ibmveth_set_multicast_list(struct net_device *dev);
 static int ibmveth_change_mtu(struct net_device *dev, int new_mtu);
 static void ibmveth_proc_register_driver(void);
@@ -909,9 +908,9 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                         skb->len, DMA_TO_DEVICE);
 
 out:   spin_lock_irqsave(&adapter->stats_lock, flags);
-       adapter->stats.tx_dropped += tx_dropped;
-       adapter->stats.tx_bytes += tx_bytes;
-       adapter->stats.tx_packets += tx_packets;
+       netdev->stats.tx_dropped += tx_dropped;
+       netdev->stats.tx_bytes += tx_bytes;
+       netdev->stats.tx_packets += tx_packets;
        adapter->tx_send_failed += tx_send_failed;
        adapter->tx_map_failed += tx_map_failed;
        spin_unlock_irqrestore(&adapter->stats_lock, flags);
@@ -957,8 +956,8 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
 
                        netif_receive_skb(skb); /* send it up */
 
-                       adapter->stats.rx_packets++;
-                       adapter->stats.rx_bytes += length;
+                       netdev->stats.rx_packets++;
+                       netdev->stats.rx_bytes += length;
                        frames_processed++;
                        netdev->last_rx = jiffies;
                }
@@ -1003,12 +1002,6 @@ static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance)
        return IRQ_HANDLED;
 }
 
-static struct net_device_stats *ibmveth_get_stats(struct net_device *dev)
-{
-       struct ibmveth_adapter *adapter = dev->priv;
-       return &adapter->stats;
-}
-
 static void ibmveth_set_multicast_list(struct net_device *netdev)
 {
        struct ibmveth_adapter *adapter = netdev->priv;
@@ -1142,8 +1135,6 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
        if(!netdev)
                return -ENOMEM;
 
-       SET_MODULE_OWNER(netdev);
-
        adapter = netdev->priv;
        dev->dev.driver_data = netdev;
 
@@ -1172,7 +1163,6 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
        netdev->open               = ibmveth_open;
        netdev->stop               = ibmveth_close;
        netdev->hard_start_xmit    = ibmveth_start_xmit;
-       netdev->get_stats          = ibmveth_get_stats;
        netdev->set_multicast_list = ibmveth_set_multicast_list;
        netdev->do_ioctl           = ibmveth_ioctl;
        netdev->ethtool_ops           = &netdev_ethtool_ops;
@@ -1258,7 +1248,6 @@ static void ibmveth_proc_register_driver(void)
 {
        ibmveth_proc_dir = proc_mkdir(IBMVETH_PROC_DIR, init_net.proc_net);
        if (ibmveth_proc_dir) {
-               SET_MODULE_OWNER(ibmveth_proc_dir);
        }
 }
 
@@ -1356,7 +1345,6 @@ static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter)
                } else {
                        entry->data = (void *) adapter;
                        entry->proc_fops = &ibmveth_proc_fops;
-                       SET_MODULE_OWNER(entry);
                }
        }
        return;