WAN: convert drivers to use built-in netdev_stats

There is no point in using separate net_device_stats structs when
the one in struct net_device is present. Compiles.

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 30 insertions, 40 deletions

diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 547368e9633d..754f00809e3e 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -845,7 +845,6 @@ fst_tx_dma_complete(struct fst_card_info *card, struct fst_port_info *port,
                     int len, int txpos)
 {
         struct net_device *dev = port_to_dev(port);
-        struct net_device_stats *stats = hdlc_stats(dev);
 
         /*
          * Everything is now set, just tell the card to go
@@ -853,8 +852,8 @@ fst_tx_dma_complete(struct fst_card_info *card, struct fst_port_info *port,
         dbg(DBG_TX, "fst_tx_dma_complete\n");
         FST_WRB(card, txDescrRing[port->index][txpos].bits,
                 DMA_OWN | TX_STP | TX_ENP);
-        stats->tx_packets++;
-        stats->tx_bytes += len;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += len;
         dev->trans_start = jiffies;
 }
 
@@ -876,7 +875,6 @@ fst_rx_dma_complete(struct fst_card_info *card, struct fst_port_info *port,
                     int len, struct sk_buff *skb, int rxp)
 {
         struct net_device *dev = port_to_dev(port);
-        struct net_device_stats *stats = hdlc_stats(dev);
         int pi;
         int rx_status;
 
@@ -888,8 +886,8 @@ fst_rx_dma_complete(struct fst_card_info *card, struct fst_port_info *port,
         FST_WRB(card, rxDescrRing[pi][rxp].bits, DMA_OWN);
 
         /* Update stats */
-        stats->rx_packets++;
-        stats->rx_bytes += len;
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += len;
 
         /* Push upstream */
         dbg(DBG_RX, "Pushing the frame up the stack\n");
@@ -900,7 +898,7 @@ fst_rx_dma_complete(struct fst_card_info *card, struct fst_port_info *port,
         rx_status = netif_rx(skb);
         fst_process_rx_status(rx_status, port_to_dev(port)->name);
         if (rx_status == NET_RX_DROP)
-                stats->rx_dropped++;
+                dev->stats.rx_dropped++;
         dev->last_rx = jiffies;
 }
 
@@ -1163,29 +1161,28 @@ fst_log_rx_error(struct fst_card_info *card, struct fst_port_info *port,
                  unsigned char dmabits, int rxp, unsigned short len)
 {
         struct net_device *dev = port_to_dev(port);
-        struct net_device_stats *stats = hdlc_stats(dev);
 
-        /* 
+        /*
          * Increment the appropriate error counter
          */
-        stats->rx_errors++;
+        dev->stats.rx_errors++;
         if (dmabits & RX_OFLO) {
-                stats->rx_fifo_errors++;
+                dev->stats.rx_fifo_errors++;
                 dbg(DBG_ASS, "Rx fifo error on card %d port %d buffer %d\n",
                     card->card_no, port->index, rxp);
         }
         if (dmabits & RX_CRC) {
-                stats->rx_crc_errors++;
+                dev->stats.rx_crc_errors++;
                 dbg(DBG_ASS, "Rx crc error on card %d port %d\n",
                     card->card_no, port->index);
         }
         if (dmabits & RX_FRAM) {
-                stats->rx_frame_errors++;
+                dev->stats.rx_frame_errors++;
                 dbg(DBG_ASS, "Rx frame error on card %d port %d\n",
                     card->card_no, port->index);
         }
         if (dmabits == (RX_STP | RX_ENP)) {
-                stats->rx_length_errors++;
+                dev->stats.rx_length_errors++;
                 dbg(DBG_ASS, "Rx length error (%d) on card %d port %d\n",
                     len, card->card_no, port->index);
         }
@@ -1242,7 +1239,6 @@ fst_intr_rx(struct fst_card_info *card, struct fst_port_info *port)
         unsigned short len;
         struct sk_buff *skb;
         struct net_device *dev = port_to_dev(port);
-        struct net_device_stats *stats = hdlc_stats(dev);
 
         /* Check we have a buffer to process */
         pi = port->index;
@@ -1291,7 +1287,7 @@ fst_intr_rx(struct fst_card_info *card, struct fst_port_info *port)
         if ((skb = dev_alloc_skb(len)) == NULL) {
                 dbg(DBG_RX, "intr_rx: can't allocate buffer\n");
 
-                stats->rx_dropped++;
+                dev->stats.rx_dropped++;
 
                 /* Return descriptor to card */
                 FST_WRB(card, rxDescrRing[pi][rxp].bits, DMA_OWN);
@@ -1316,8 +1312,8 @@ fst_intr_rx(struct fst_card_info *card, struct fst_port_info *port)
                 FST_WRB(card, rxDescrRing[pi][rxp].bits, DMA_OWN);
 
                 /* Update stats */
-                stats->rx_packets++;
-                stats->rx_bytes += len;
+                dev->stats.rx_packets++;
+                dev->stats.rx_bytes += len;
 
                 /* Push upstream */
                 dbg(DBG_RX, "Pushing frame up the stack\n");
@@ -1327,9 +1323,8 @@ fst_intr_rx(struct fst_card_info *card, struct fst_port_info *port)
                         skb->protocol = hdlc_type_trans(skb, dev);
                 rx_status = netif_rx(skb);
                 fst_process_rx_status(rx_status, port_to_dev(port)->name);
-                if (rx_status == NET_RX_DROP) {
-                        stats->rx_dropped++;
-                }
+                if (rx_status == NET_RX_DROP)
+                        dev->stats.rx_dropped++;
                 dev->last_rx = jiffies;
         } else {
                 card->dma_skb_rx = skb;
@@ -1361,7 +1356,6 @@ do_bottom_half_tx(struct fst_card_info *card)
         struct sk_buff *skb;
         unsigned long flags;
         struct net_device *dev;
-        struct net_device_stats *stats;
 
         /*
          *  Find a free buffer for the transmit
@@ -1373,12 +1367,10 @@ do_bottom_half_tx(struct fst_card_info *card)
                 if (!port->run)
                         continue;
 
-                dev = port_to_dev(port);
-                stats = hdlc_stats(dev);
-                while (!
-                       (FST_RDB(card, txDescrRing[pi][port->txpos].bits) &
-                        DMA_OWN)
-                       && !(card->dmatx_in_progress)) {
+                dev = port_to_dev(port);
+                while (!(FST_RDB(card, txDescrRing[pi][port->txpos].bits) &
+                         DMA_OWN)
+                       && !(card->dmatx_in_progress)) {
                         /*
                          * There doesn't seem to be a txdone event per-se
                          * We seem to have to deduce it, by checking the DMA_OWN
@@ -1422,8 +1414,8 @@ do_bottom_half_tx(struct fst_card_info *card)
                                                 txDescrRing[pi][port->txpos].
                                                 bits,
                                                 DMA_OWN | TX_STP | TX_ENP);
-                                        stats->tx_packets++;
-                                        stats->tx_bytes += skb->len;
+                                        dev->stats.tx_packets++;
+                                        dev->stats.tx_bytes += skb->len;
                                         dev->trans_start = jiffies;
                                 } else {
                                         /* Or do it through dma */
@@ -1628,8 +1620,8 @@ fst_intr(int dummy, void *dev_id)
                          * always load up the entire packet for DMA.
                          */
                         dbg(DBG_TX, "Tx underflow port %d\n", port->index);
-                        hdlc_stats(port_to_dev(port))->tx_errors++;
-                        hdlc_stats(port_to_dev(port))->tx_fifo_errors++;
+                        port_to_dev(port)->stats.tx_errors++;
+                        port_to_dev(port)->stats.tx_fifo_errors++;
                         dbg(DBG_ASS, "Tx underflow on card %d port %d\n",
                             card->card_no, port->index);
                         break;
@@ -2292,12 +2284,11 @@ fst_tx_timeout(struct net_device *dev)
 {
         struct fst_port_info *port;
         struct fst_card_info *card;
-        struct net_device_stats *stats = hdlc_stats(dev);
 
         port = dev_to_port(dev);
         card = port->card;
-        stats->tx_errors++;
-        stats->tx_aborted_errors++;
+        dev->stats.tx_errors++;
+        dev->stats.tx_aborted_errors++;
         dbg(DBG_ASS, "Tx timeout card %d port %d\n",
             card->card_no, port->index);
         fst_issue_cmd(port, ABORTTX);
@@ -2312,7 +2303,6 @@ fst_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct fst_card_info *card;
         struct fst_port_info *port;
-        struct net_device_stats *stats = hdlc_stats(dev);
         unsigned long flags;
         int txq_length;
 
@@ -2323,8 +2313,8 @@ fst_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* Drop packet with error if we don't have carrier */
         if (!netif_carrier_ok(dev)) {
                 dev_kfree_skb(skb);
-                stats->tx_errors++;
-                stats->tx_carrier_errors++;
+                dev->stats.tx_errors++;
+                dev->stats.tx_carrier_errors++;
                 dbg(DBG_ASS,
                     "Tried to transmit but no carrier on card %d port %d\n",
                     card->card_no, port->index);
@@ -2336,7 +2326,7 @@ fst_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 dbg(DBG_ASS, "Packet too large %d vs %d\n", skb->len,
                     LEN_TX_BUFFER);
                 dev_kfree_skb(skb);
-                stats->tx_errors++;
+                dev->stats.tx_errors++;
                 return 0;
         }
 
@@ -2368,7 +2358,7 @@ fst_start_xmit(struct sk_buff *skb, struct net_device *dev)
                  * This shouldn't have happened but such is life
                  */
                 dev_kfree_skb(skb);
-                stats->tx_errors++;
+                dev->stats.tx_errors++;
                 dbg(DBG_ASS, "Tx queue overflow card %d port %d\n",
                     card->card_no, port->index);
                 return 0;