irda: convert to internal stats

Convert IRDA drivers to use already existing net_device_stats structure
in network device. This is a pre-cursor to conversion to net_device
ops. Compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 19 deletions

diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 205e4e825a97..29118f58a141 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -122,7 +122,6 @@ static int irda_usb_net_open(struct net_device *dev);
 static int irda_usb_net_close(struct net_device *dev);
 static int irda_usb_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static void irda_usb_net_timeout(struct net_device *dev);
-static struct net_device_stats *irda_usb_net_get_stats(struct net_device *dev);
 
 /************************ TRANSMIT ROUTINES ************************/
 /*
@@ -525,13 +524,13 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
         /* Ask USB to send the packet - Irq disabled -> GFP_ATOMIC */
         if ((res = usb_submit_urb(urb, GFP_ATOMIC))) {
                 IRDA_WARNING("%s(), failed Tx URB\n", __func__);
-                self->stats.tx_errors++;
+                netdev->stats.tx_errors++;
                 /* Let USB recover : We will catch that in the watchdog */
                 /*netif_start_queue(netdev);*/
         } else {
                 /* Increment packet stats */
-                self->stats.tx_packets++;
-                self->stats.tx_bytes += skb->len;
+                netdev->stats.tx_packets++;
+                netdev->stats.tx_bytes += skb->len;
                 
                 netdev->trans_start = jiffies;
         }
@@ -677,7 +676,7 @@ static void irda_usb_net_timeout(struct net_device *netdev)
                 IRDA_DEBUG(0, "%s: Tx timed out, urb->status=%d, urb->transfer_flags=0x%04X\n", netdev->name, urb->status, urb->transfer_flags);
 
                 /* Increase error count */
-                self->stats.tx_errors++;
+                netdev->stats.tx_errors++;
 
 #ifdef IU_BUG_KICK_TIMEOUT
                 /* Can't be a bad idea to reset the speed ;-) - Jean II */
@@ -826,7 +825,7 @@ static void irda_usb_receive(struct urb *urb)
         if (urb->status != 0) {
                 switch (urb->status) {
                 case -EILSEQ:
-                        self->stats.rx_crc_errors++;    
+                        self->netdev->stats.rx_crc_errors++;
                         /* Also precursor to a hot-unplug on UHCI. */
                         /* Fallthrough... */
                 case -ECONNRESET:
@@ -839,7 +838,7 @@ static void irda_usb_receive(struct urb *urb)
                 case -ETIME:
                         /* Usually precursor to a hot-unplug on OHCI. */
                 default:
-                        self->stats.rx_errors++;
+                        self->netdev->stats.rx_errors++;
                         IRDA_DEBUG(0, "%s(), RX status %d, transfer_flags 0x%04X \n", __func__, urb->status, urb->transfer_flags);
                         break;
                 }
@@ -890,7 +889,7 @@ static void irda_usb_receive(struct urb *urb)
                                        IRDA_SKB_MAX_MTU);
 
         if (!newskb)  {
-                self->stats.rx_dropped++;
+                self->netdev->stats.rx_dropped++;
                 /* We could deliver the current skb, but this would stall
                  * the Rx path. Better drop the packet... Jean II */
                 goto done;  
@@ -927,8 +926,8 @@ static void irda_usb_receive(struct urb *urb)
         netif_rx(dataskb);
 
         /* Keep stats up to date */
-        self->stats.rx_bytes += len;
-        self->stats.rx_packets++;
+        self->netdev->stats.rx_bytes += len;
+        self->netdev->stats.rx_packets++;
 
 done:
         /* Note : at this point, the URB we've just received (urb)
@@ -1342,14 +1341,6 @@ static int irda_usb_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 }
 
 /*------------------------------------------------------------------*/
-/*
- * Get device stats (for /proc/net/dev and ifconfig)
- */
-static struct net_device_stats *irda_usb_net_get_stats(struct net_device *dev)
-{
-        struct irda_usb_cb *self = netdev_priv(dev);
-        return &self->stats;
-}
 
 /********************* IRDA CONFIG SUBROUTINES *********************/
 /*
@@ -1428,7 +1419,6 @@ static inline int irda_usb_open(struct irda_usb_cb *self)
         netdev->watchdog_timeo  = 250*HZ/1000;  /* 250 ms > USB timeout */
         netdev->open            = irda_usb_net_open;
         netdev->stop            = irda_usb_net_close;
-        netdev->get_stats       = irda_usb_net_get_stats;
         netdev->do_ioctl        = irda_usb_net_ioctl;
 
         return register_netdev(netdev);