igb: add support for SGMII-based MDIO PHYs

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

diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index 9bddb5fa7a9697d6d4a85ab9ea73960742ed7658..33618edc61f9a3bc85d37bdc202e473db43a3853 100644 (file)
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -185,7 +185,6 @@ static void    ni52_xmt_int(struct net_device *dev);
 static void    ni52_rnr_int(struct net_device *dev);
 
 struct priv {
-       struct net_device_stats stats;
        char __iomem *base;
        char __iomem *mapped;
        char __iomem *memtop;
@@ -972,10 +971,10 @@ static void ni52_rcv_int(struct net_device *dev)
                                        memcpy_fromio(skb->data, p->base + readl(&rbd->buffer), totlen);
                                        skb->protocol = eth_type_trans(skb, dev);
                                        netif_rx(skb);
-                                       p->stats.rx_packets++;
-                                       p->stats.rx_bytes += totlen;
+                                       dev->stats.rx_packets++;
+                                       dev->stats.rx_bytes += totlen;
                                } else
-                                       p->stats.rx_dropped++;
+                                       dev->stats.rx_dropped++;
                        } else {
                                int rstat;
                                 /* free all RBD's until RBD_LAST is set */
@@ -993,12 +992,12 @@ static void ni52_rcv_int(struct net_device *dev)
                                writew(0, &rbd->status);
                                printk(KERN_ERR "%s: received oversized frame! length: %d\n",
                                        dev->name, totlen);
-                               p->stats.rx_dropped++;
+                               dev->stats.rx_dropped++;
                         }
                } else {/* frame !(ok), only with 'save-bad-frames' */
                        printk(KERN_ERR "%s: oops! rfd-error-status: %04x\n",
                                dev->name, status);
-                       p->stats.rx_errors++;
+                       dev->stats.rx_errors++;
                }
                writeb(0, &p->rfd_top->stat_high);
                writeb(RFD_SUSP, &p->rfd_top->last); /* maybe exchange by RFD_LAST */
@@ -1043,7 +1042,7 @@ static void ni52_rnr_int(struct net_device *dev)
 {
        struct priv *p = netdev_priv(dev);
 
-       p->stats.rx_errors++;
+       dev->stats.rx_errors++;
 
        wait_for_scb_cmd(dev);          /* wait for the last cmd, WAIT_4_FULLSTAT?? */
        writeb(RUC_ABORT, &p->scb->cmd_ruc); /* usually the RU is in the 'no resource'-state .. abort it now. */
@@ -1076,29 +1075,29 @@ static void ni52_xmt_int(struct net_device *dev)
                printk(KERN_ERR "%s: strange .. xmit-int without a 'COMPLETE'\n", dev->name);
 
        if (status & STAT_OK) {
-               p->stats.tx_packets++;
-               p->stats.collisions += (status & TCMD_MAXCOLLMASK);
+               dev->stats.tx_packets++;
+               dev->stats.collisions += (status & TCMD_MAXCOLLMASK);
        } else {
-               p->stats.tx_errors++;
+               dev->stats.tx_errors++;
                if (status & TCMD_LATECOLL) {
                        printk(KERN_ERR "%s: late collision detected.\n",
                                dev->name);
-                       p->stats.collisions++;
+                       dev->stats.collisions++;
                } else if (status & TCMD_NOCARRIER) {
-                       p->stats.tx_carrier_errors++;
+                       dev->stats.tx_carrier_errors++;
                        printk(KERN_ERR "%s: no carrier detected.\n",
                                dev->name);
                } else if (status & TCMD_LOSTCTS)
                        printk(KERN_ERR "%s: loss of CTS detected.\n",
                                dev->name);
                else if (status & TCMD_UNDERRUN) {
-                       p->stats.tx_fifo_errors++;
+                       dev->stats.tx_fifo_errors++;
                        printk(KERN_ERR "%s: DMA underrun detected.\n",
                                dev->name);
                } else if (status & TCMD_MAXCOLL) {
                        printk(KERN_ERR "%s: Max. collisions exceeded.\n",
                                dev->name);
-                       p->stats.collisions += 16;
+                       dev->stats.collisions += 16;
                }
        }
 #if (NUM_XMIT_BUFFS > 1)
@@ -1286,12 +1285,12 @@ static struct net_device_stats *ni52_get_stats(struct net_device *dev)
        ovrn = readw(&p->scb->ovrn_errs);
        writew(0, &p->scb->ovrn_errs);
 
-       p->stats.rx_crc_errors += crc;
-       p->stats.rx_fifo_errors += ovrn;
-       p->stats.rx_frame_errors += aln;
-       p->stats.rx_dropped += rsc;
+       dev->stats.rx_crc_errors += crc;
+       dev->stats.rx_fifo_errors += ovrn;
+       dev->stats.rx_frame_errors += aln;
+       dev->stats.rx_dropped += rsc;
 
-       return &p->stats;
+       return &dev->stats;
 }
 
 /********************************************************