bnx2x: convert to net_device_ops

[karo-tx-linux.git] / drivers / net / myri_sbus.c

diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 1bbdde199220d4952b9e8182968bae96b78f04aa..6833f65f8aeca2edbb67223f0ed88bf8e8e64aa4 100644 (file)
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -525,7 +525,6 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)
                DRX(("prot[%04x] netif_rx ", skb->protocol));
                netif_rx(skb);
 
-               dev->last_rx = jiffies;
                dev->stats.rx_packets++;
                dev->stats.rx_bytes += len;
        next:
@@ -537,7 +536,7 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)
 static irqreturn_t myri_interrupt(int irq, void *dev_id)
 {
        struct net_device *dev          = (struct net_device *) dev_id;
-       struct myri_eth *mp             = (struct myri_eth *) dev->priv;
+       struct myri_eth *mp             = netdev_priv(dev);
        void __iomem *lregs             = mp->lregs;
        struct myri_channel __iomem *chan = &mp->shmem->channel;
        unsigned long flags;
@@ -576,14 +575,14 @@ static irqreturn_t myri_interrupt(int irq, void *dev_id)
 
 static int myri_open(struct net_device *dev)
 {
-       struct myri_eth *mp = (struct myri_eth *) dev->priv;
+       struct myri_eth *mp = netdev_priv(dev);
 
        return myri_init(mp, in_interrupt());
 }
 
 static int myri_close(struct net_device *dev)
 {
-       struct myri_eth *mp = (struct myri_eth *) dev->priv;
+       struct myri_eth *mp = netdev_priv(dev);
 
        myri_clean_rings(mp);
        return 0;
@@ -591,7 +590,7 @@ static int myri_close(struct net_device *dev)
 
 static void myri_tx_timeout(struct net_device *dev)
 {
-       struct myri_eth *mp = (struct myri_eth *) dev->priv;
+       struct myri_eth *mp = netdev_priv(dev);
 
        printk(KERN_ERR "%s: transmit timed out, resetting\n", dev->name);
 
@@ -602,7 +601,7 @@ static void myri_tx_timeout(struct net_device *dev)
 
 static int myri_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-       struct myri_eth *mp = (struct myri_eth *) dev->priv;
+       struct myri_eth *mp = netdev_priv(dev);
        struct sendq __iomem *sq = mp->sq;
        struct myri_txd __iomem *txd;
        unsigned long flags;