Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

[powerpc.git] / drivers / net / meth.c

diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index e1d97cd..0343ea1 100644 (file)
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 
-#include <linux/sched.h>
 #include <linux/kernel.h> /* printk() */
 #include <linux/delay.h>
 #include <linux/slab.h>
@@ -171,7 +170,7 @@ static int mdio_probe(struct meth_private *priv)
 
 static void meth_check_link(struct net_device *dev)
 {
-       struct meth_private *priv = (struct meth_private *) dev->priv;
+       struct meth_private *priv = netdev_priv(dev);
        unsigned long mii_advertising = mdio_read(priv, 4);
        unsigned long mii_partner = mdio_read(priv, 5);
        unsigned long negotiated = mii_advertising & mii_partner;
@@ -269,7 +268,7 @@ static void meth_free_rx_ring(struct meth_private *priv)
 
 int meth_reset(struct net_device *dev)
 {
-       struct meth_private *priv = (struct meth_private *) dev->priv;
+       struct meth_private *priv = netdev_priv(dev);
 
        /* Reset card */
        mace->eth.mac_ctrl = SGI_MAC_RESET;
@@ -311,7 +310,7 @@ int meth_reset(struct net_device *dev)
  */
 static int meth_open(struct net_device *dev)
 {
-       struct meth_private *priv = dev->priv;
+       struct meth_private *priv = netdev_priv(dev);
        int ret;
 
        priv->phy_addr = -1;    /* No PHY is known yet... */
@@ -355,7 +354,7 @@ out_free_tx_ring:
 
 static int meth_release(struct net_device *dev)
 {
-       struct meth_private *priv = dev->priv;
+       struct meth_private *priv = netdev_priv(dev);
 
        DPRINTK("Stopping queue\n");
        netif_stop_queue(dev); /* can't transmit any more */
@@ -377,7 +376,7 @@ static void meth_rx(struct net_device* dev, unsigned long int_status)
 {
        struct sk_buff *skb;
        unsigned long status;
-       struct meth_private *priv = (struct meth_private *) dev->priv;
+       struct meth_private *priv = netdev_priv(dev);
        unsigned long fifo_rptr = (int_status & METH_INT_RX_RPTR_MASK) >> 8;
 
        spin_lock(&priv->meth_lock);
@@ -422,7 +421,6 @@ static void meth_rx(struct net_device* dev, unsigned long int_status)
                                        /* Write metadata, and then pass to the receive level */
                                        skb_put(skb_c, len);
                                        priv->rx_skbs[priv->rx_write] = skb;
-                                       skb_c->dev = dev;
                                        skb_c->protocol = eth_type_trans(skb_c, dev);
                                        dev->last_rx = jiffies;
                                        priv->stats.rx_packets++;
@@ -467,14 +465,14 @@ static void meth_rx(struct net_device* dev, unsigned long int_status)
 
 static int meth_tx_full(struct net_device *dev)
 {
-       struct meth_private *priv = (struct meth_private *) dev->priv;
+       struct meth_private *priv = netdev_priv(dev);
 
        return (priv->tx_count >= TX_RING_ENTRIES - 1);
 }
 
 static void meth_tx_cleanup(struct net_device* dev, unsigned long int_status)
 {
-       struct meth_private *priv = dev->priv;
+       struct meth_private *priv = netdev_priv(dev);
        unsigned long status;
        struct sk_buff *skb;
        unsigned long rptr = (int_status&TX_INFO_RPTR) >> 16;
@@ -537,7 +535,7 @@ static void meth_tx_cleanup(struct net_device* dev, unsigned long int_status)
 
 static void meth_error(struct net_device* dev, unsigned status)
 {
-       struct meth_private *priv = (struct meth_private *) dev->priv;
+       struct meth_private *priv = netdev_priv(dev);
 
        printk(KERN_WARNING "meth: error status: 0x%08x\n",status);
        /* check for errors too... */
@@ -571,7 +569,7 @@ static void meth_error(struct net_device* dev, unsigned status)
 static irqreturn_t meth_interrupt(int irq, void *dev_id)
 {
        struct net_device *dev = (struct net_device *)dev_id;
-       struct meth_private *priv = (struct meth_private *) dev->priv;
+       struct meth_private *priv = netdev_priv(dev);
        unsigned long status;
 
        status = mace->eth.int_stat;
@@ -610,7 +608,7 @@ static void meth_tx_short_prepare(struct meth_private *priv,
 
        desc->header.raw = METH_TX_CMD_INT_EN | (len-1) | ((128-len) << 16);
        /* maybe I should set whole thing to 0 first... */
-       memcpy(desc->data.dt + (120 - len), skb->data, skb->len);
+       skb_copy_from_linear_data(skb, desc->data.dt + (120 - len), skb->len);
        if (skb->len < len)
                memset(desc->data.dt + 120 - len + skb->len, 0, len-skb->len);
 }
@@ -628,8 +626,8 @@ static void meth_tx_1page_prepare(struct meth_private *priv,
 
        /* unaligned part */
        if (unaligned_len) {
-               memcpy(desc->data.dt + (120 - unaligned_len),
-                      skb->data, unaligned_len);
+               skb_copy_from_linear_data(skb, desc->data.dt + (120 - unaligned_len),
+                             unaligned_len);
                desc->header.raw |= (128 - unaligned_len) << 16;
        }
 
@@ -654,8 +652,8 @@ static void meth_tx_2page_prepare(struct meth_private *priv,
        desc->header.raw = METH_TX_CMD_INT_EN | TX_CATBUF1 | TX_CATBUF2| (skb->len - 1);
        /* unaligned part */
        if (unaligned_len){
-               memcpy(desc->data.dt + (120 - unaligned_len),
-                      skb->data, unaligned_len);
+               skb_copy_from_linear_data(skb, desc->data.dt + (120 - unaligned_len),
+                             unaligned_len);
                desc->header.raw |= (128 - unaligned_len) << 16;
        }
 
@@ -696,7 +694,7 @@ static void meth_add_to_tx_ring(struct meth_private *priv, struct sk_buff *skb)
  */
 static int meth_tx(struct sk_buff *skb, struct net_device *dev)
 {
-       struct meth_private *priv = (struct meth_private *) dev->priv;
+       struct meth_private *priv = netdev_priv(dev);
        unsigned long flags;
 
        spin_lock_irqsave(&priv->meth_lock, flags);
@@ -727,7 +725,7 @@ static int meth_tx(struct sk_buff *skb, struct net_device *dev)
  */
 static void meth_tx_timeout(struct net_device *dev)
 {
-       struct meth_private *priv = (struct meth_private *) dev->priv;
+       struct meth_private *priv = netdev_priv(dev);
        unsigned long flags;
 
        printk(KERN_WARNING "%s: transmit timed out\n", dev->name);
@@ -779,7 +777,7 @@ static int meth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
  */
 static struct net_device_stats *meth_stats(struct net_device *dev)
 {
-       struct meth_private *priv = (struct meth_private *) dev->priv;
+       struct meth_private *priv = netdev_priv(dev);
        return &priv->stats;
 }
 
@@ -808,7 +806,7 @@ static struct net_device *meth_init(void)
        dev->irq             = MACE_ETHERNET_IRQ;
        dev->base_addr       = (unsigned long)&mace->eth;
 
-       priv = (struct meth_private *) dev->priv;
+       priv = netdev_priv(dev);
        spin_lock_init(&priv->meth_lock);
 
        ret = register_netdev(dev);