ath5k: Restore saved initval after POST

[linux-2.6-omap-h63xx.git] / drivers / net / wan / dscc4.c

diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index c6f26e28e3769ba12135a8dd7de19678956ee7ee..50ef5b4efd6dc1e60b6f718b0bdc267c8e04d5e2 100644 (file)
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -642,7 +642,6 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv,
                                struct net_device *dev)
 {
        struct RxFD *rx_fd = dpriv->rx_fd + dpriv->rx_current%RX_RING_SIZE;
-       struct net_device_stats *stats = hdlc_stats(dev);
        struct pci_dev *pdev = dpriv->pci_priv->pdev;
        struct sk_buff *skb;
        int pkt_len;
@@ -656,8 +655,8 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv,
        pci_unmap_single(pdev, le32_to_cpu(rx_fd->data),
                         RX_MAX(HDLC_MAX_MRU), PCI_DMA_FROMDEVICE);
        if ((skb->data[--pkt_len] & FrameOk) == FrameOk) {
-               stats->rx_packets++;
-               stats->rx_bytes += pkt_len;
+               dev->stats.rx_packets++;
+               dev->stats.rx_bytes += pkt_len;
                skb_put(skb, pkt_len);
                if (netif_running(dev))
                        skb->protocol = hdlc_type_trans(skb, dev);
@@ -665,13 +664,13 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv,
                netif_rx(skb);
        } else {
                if (skb->data[pkt_len] & FrameRdo)
-                       stats->rx_fifo_errors++;
+                       dev->stats.rx_fifo_errors++;
                else if (!(skb->data[pkt_len] | ~FrameCrc))
-                       stats->rx_crc_errors++;
+                       dev->stats.rx_crc_errors++;
                else if (!(skb->data[pkt_len] | ~(FrameVfr | FrameRab)))
-                       stats->rx_length_errors++;
+                       dev->stats.rx_length_errors++;
                else
-                       stats->rx_errors++;
+                       dev->stats.rx_errors++;
                dev_kfree_skb_irq(skb);
        }
 refill:
@@ -1569,7 +1568,6 @@ try:
 
        if (state & SccEvt) {
                if (state & Alls) {
-                       struct net_device_stats *stats = hdlc_stats(dev);
                        struct sk_buff *skb;
                        struct TxFD *tx_fd;
 
@@ -1586,8 +1584,8 @@ try:
                                pci_unmap_single(ppriv->pdev, le32_to_cpu(tx_fd->data),
                                                 skb->len, PCI_DMA_TODEVICE);
                                if (tx_fd->state & FrameEnd) {
-                                       stats->tx_packets++;
-                                       stats->tx_bytes += skb->len;
+                                       dev->stats.tx_packets++;
+                                       dev->stats.tx_bytes += skb->len;
                                }
                                dev_kfree_skb_irq(skb);
                                dpriv->tx_skbuff[cur] = NULL;
@@ -1698,7 +1696,7 @@ try:
                }
                if (state & Err) {
                        printk(KERN_INFO "%s: Tx ERR\n", dev->name);
-                       hdlc_stats(dev)->tx_errors++;
+                       dev->stats.tx_errors++;
                        state &= ~Err;
                }
        }
@@ -1834,7 +1832,7 @@ try:
                                if (!(rx_fd->state2 & DataComplete))
                                        break;
                                if (rx_fd->state2 & FrameAborted) {
-                                       hdlc_stats(dev)->rx_over_errors++;
+                                       dev->stats.rx_over_errors++;
                                        rx_fd->state1 |= Hold;
                                        rx_fd->state2 = 0x00000000;
                                        rx_fd->end = cpu_to_le32(0xbabeface);