netdevice: safe convert to netdev_priv() #part-3

We have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously
   netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it
directly.

This patch is a safe convert for netdev->priv to netdev_priv(netdev).
Since all of the netdev->priv is only for read.
But it is too big to be sent in one mail.
I split it to 4 parts and make every part smaller than 100,000 bytes,
which is max size allowed by vger.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 56 insertions, 56 deletions

diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 5d13832978eb..a297e3efa05d 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -74,7 +74,7 @@ static int dlci_header(struct sk_buff *skb, struct net_device *dev,
         unsigned int            hlen;
         char                    *dest;
 
-        dlp = dev->priv;
+        dlp = netdev_priv(dev);
 
         hdr.control = FRAD_I_UI;
         switch(type)
@@ -110,7 +110,7 @@ static void dlci_receive(struct sk_buff *skb, struct net_device *dev)
         struct frhdr            *hdr;
         int                                     process, header;
 
-        dlp = dev->priv;
+        dlp = netdev_priv(dev);
         if (!pskb_may_pull(skb, sizeof(*hdr))) {
                 printk(KERN_NOTICE "%s: invalid data no header\n",
                        dev->name);
@@ -196,7 +196,7 @@ static int dlci_transmit(struct sk_buff *skb, struct net_device *dev)
         if (!skb || !dev)
                 return(0);
 
-        dlp = dev->priv;
+        dlp = netdev_priv(dev);
 
         netif_stop_queue(dev);
         
@@ -234,9 +234,9 @@ static int dlci_config(struct net_device *dev, struct dlci_conf __user *conf, in
         struct frad_local       *flp;
         int                     err;
 
-        dlp = dev->priv;
+        dlp = netdev_priv(dev);
 
-        flp = dlp->slave->priv;
+        flp = netdev_priv(dlp->slave);
 
         if (!get)
         {
@@ -268,7 +268,7 @@ static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         if (!capable(CAP_NET_ADMIN))
                 return(-EPERM);
 
-        dlp = dev->priv;
+        dlp = netdev_priv(dev);
 
         switch(cmd)
         {
@@ -297,7 +297,7 @@ static int dlci_change_mtu(struct net_device *dev, int new_mtu)
 {
         struct dlci_local *dlp;
 
-        dlp = dev->priv;
+        dlp = netdev_priv(dev);
 
         return((*dlp->slave->change_mtu)(dlp->slave, new_mtu));
 }
@@ -308,7 +308,7 @@ static int dlci_open(struct net_device *dev)
         struct frad_local       *flp;
         int                     err;
 
-        dlp = dev->priv;
+        dlp = netdev_priv(dev);
 
         if (!*(short *)(dev->dev_addr))
                 return(-EINVAL);
@@ -316,7 +316,7 @@ static int dlci_open(struct net_device *dev)
         if (!netif_running(dlp->slave))
                 return(-ENOTCONN);
 
-        flp = dlp->slave->priv;
+        flp = netdev_priv(dlp->slave);
         err = (*flp->activate)(dlp->slave, dev);
         if (err)
                 return(err);
@@ -334,9 +334,9 @@ static int dlci_close(struct net_device *dev)
 
         netif_stop_queue(dev);
 
-        dlp = dev->priv;
+        dlp = netdev_priv(dev);
 
-        flp = dlp->slave->priv;
+        flp = netdev_priv(dlp->slave);
         err = (*flp->deactivate)(dlp->slave, dev);
 
         return 0;
@@ -346,7 +346,7 @@ static struct net_device_stats *dlci_get_stats(struct net_device *dev)
 {
         struct dlci_local *dlp;
 
-        dlp = dev->priv;
+        dlp = netdev_priv(dev);
 
         return(&dlp->stats);
 }
@@ -364,7 +364,7 @@ static int dlci_add(struct dlci_add *dlci)
         if (!slave)
                 return -ENODEV;
 
-        if (slave->type != ARPHRD_FRAD || slave->priv == NULL)
+        if (slave->type != ARPHRD_FRAD || netdev_priv(slave) == NULL)
                 goto err1;
 
         /* create device name */
@@ -390,11 +390,11 @@ static int dlci_add(struct dlci_add *dlci)
 
         *(short *)(master->dev_addr) = dlci->dlci;
 
-        dlp = (struct dlci_local *) master->priv;
+        dlp = netdev_priv(master);
         dlp->slave = slave;
         dlp->master = master;
 
-        flp = slave->priv;
+        flp = netdev_priv(slave);
         err = (*flp->assoc)(slave, master);
         if (err < 0)
                 goto err2;
@@ -434,9 +434,9 @@ static int dlci_del(struct dlci_add *dlci)
                 return(-EBUSY);
         }
 
-        dlp = master->priv;
+        dlp = netdev_priv(master);
         slave = dlp->slave;
-        flp = slave->priv;
+        flp = netdev_priv(slave);
 
         rtnl_lock();
         err = (*flp->deassoc)(slave, master);
@@ -490,7 +490,7 @@ static const struct header_ops dlci_header_ops = {
 
 static void dlci_setup(struct net_device *dev)
 {
-        struct dlci_local *dlp = dev->priv;
+        struct dlci_local *dlp = netdev_priv(dev);
 
         dev->flags              = 0;
         dev->open               = dlci_open;
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 73e2f2780932..6a07ba9371db 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -185,7 +185,7 @@ static void sdla_stop(struct net_device *dev)
 {
         struct frad_local *flp;
 
-        flp = dev->priv;
+        flp = netdev_priv(dev);
         switch(flp->type)
         {
                 case SDLA_S502A:
@@ -212,7 +212,7 @@ static void sdla_start(struct net_device *dev)
 {
         struct frad_local *flp;
 
-        flp = dev->priv;
+        flp = netdev_priv(dev);
         switch(flp->type)
         {
                 case SDLA_S502A:
@@ -432,7 +432,7 @@ static int sdla_cmd(struct net_device *dev, int cmd, short dlci, short flags,
         int                      ret, waiting, len;
         long                     window;
 
-        flp = dev->priv;
+        flp = netdev_priv(dev);
         window = flp->type == SDLA_S508 ? SDLA_508_CMD_BUF : SDLA_502_CMD_BUF;
         cmd_buf = (struct sdla_cmd *)(dev->mem_start + (window & SDLA_ADDR_MASK));
         ret = 0;
@@ -509,7 +509,7 @@ static int sdla_activate(struct net_device *slave, struct net_device *master)
         struct frad_local *flp;
         int i;
 
-        flp = slave->priv;
+        flp = netdev_priv(slave);
 
         for(i=0;i<CONFIG_DLCI_MAX;i++)
                 if (flp->master[i] == master)
@@ -531,7 +531,7 @@ static int sdla_deactivate(struct net_device *slave, struct net_device *master)
         struct frad_local *flp;
         int               i;
 
-        flp = slave->priv;
+        flp = netdev_priv(slave);
 
         for(i=0;i<CONFIG_DLCI_MAX;i++)
                 if (flp->master[i] == master)
@@ -556,7 +556,7 @@ static int sdla_assoc(struct net_device *slave, struct net_device *master)
         if (master->type != ARPHRD_DLCI)
                 return(-EINVAL);
 
-        flp = slave->priv;
+        flp = netdev_priv(slave);
 
         for(i=0;i<CONFIG_DLCI_MAX;i++)
         {
@@ -589,7 +589,7 @@ static int sdla_deassoc(struct net_device *slave, struct net_device *master)
         struct frad_local *flp;
         int               i;
 
-        flp = slave->priv;
+        flp = netdev_priv(slave);
 
         for(i=0;i<CONFIG_DLCI_MAX;i++)
                 if (flp->master[i] == master)
@@ -619,7 +619,7 @@ static int sdla_dlci_conf(struct net_device *slave, struct net_device *master, i
         int               i;
         short             len, ret;
 
-        flp = slave->priv;
+        flp = netdev_priv(slave);
 
         for(i=0;i<CONFIG_DLCI_MAX;i++)
                 if (flp->master[i] == master)
@@ -628,7 +628,7 @@ static int sdla_dlci_conf(struct net_device *slave, struct net_device *master, i
         if (i == CONFIG_DLCI_MAX)
                 return(-ENODEV);
 
-        dlp = master->priv;
+        dlp = netdev_priv(master);
 
         ret = SDLA_RET_OK;
         len = sizeof(struct dlci_conf);
@@ -659,7 +659,7 @@ static int sdla_transmit(struct sk_buff *skb, struct net_device *dev)
         unsigned long     flags;
         struct buf_entry  *pbuf;
 
-        flp = dev->priv;
+        flp = netdev_priv(dev);
         ret = 0;
         accept = 1;
 
@@ -755,7 +755,7 @@ static void sdla_receive(struct net_device *dev)
         int               i=0, received, success, addr, buf_base, buf_top;
         short             dlci, len, len2, split;
 
-        flp = dev->priv;
+        flp = netdev_priv(dev);
         success = 1;
         received = addr = buf_top = buf_base = 0;
         len = dlci = 0;
@@ -860,7 +860,7 @@ static void sdla_receive(struct net_device *dev)
         if (success)
         {
                 flp->stats.rx_packets++;
-                dlp = master->priv;
+                dlp = netdev_priv(master);
                 (*dlp->receive)(skb, master);
         }
 
@@ -925,7 +925,7 @@ static void sdla_poll(unsigned long device)
         struct frad_local *flp;
 
         dev = (struct net_device *) device;
-        flp = dev->priv;
+        flp = netdev_priv(dev);
 
         if (sdla_byte(dev, SDLA_502_RCV_BUF))
                 sdla_receive(dev);
@@ -941,7 +941,7 @@ static int sdla_close(struct net_device *dev)
         int               len, i;
         short             dlcis[CONFIG_DLCI_MAX];
 
-        flp = dev->priv;
+        flp = netdev_priv(dev);
 
         len = 0;
         for(i=0;i<CONFIG_DLCI_MAX;i++)
@@ -1002,7 +1002,7 @@ static int sdla_open(struct net_device *dev)
         int               len, i;
         char              byte;
 
-        flp = dev->priv;
+        flp = netdev_priv(dev);
 
         if (!flp->initialized)
                 return(-EPERM);
@@ -1079,7 +1079,7 @@ static int sdla_open(struct net_device *dev)
         for(i=0;i<CONFIG_DLCI_MAX;i++)
                 if (flp->dlci[i])
                 {
-                        dlp = flp->master[i]->priv;
+                        dlp = netdev_priv(flp->master[i]);
                         if (dlp->configured)
                                 sdla_cmd(dev, SDLA_SET_DLCI_CONFIGURATION, abs(flp->dlci[i]), 0, &dlp->config, sizeof(struct dlci_conf), NULL, NULL);
                 }
@@ -1099,7 +1099,7 @@ static int sdla_config(struct net_device *dev, struct frad_conf __user *conf, in
         if (dev->type == 0xFFFF)
                 return(-EUNATCH);
 
-        flp = dev->priv;
+        flp = netdev_priv(dev);
 
         if (!get)
         {
@@ -1230,7 +1230,7 @@ static int sdla_reconfig(struct net_device *dev)
         struct conf_data  data;
         int               i, len;
 
-        flp = dev->priv;
+        flp = netdev_priv(dev);
 
         len = 0;
         for(i=0;i<CONFIG_DLCI_MAX;i++)
@@ -1255,7 +1255,7 @@ static int sdla_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         if(!capable(CAP_NET_ADMIN))
                 return -EPERM;
                 
-        flp = dev->priv;
+        flp = netdev_priv(dev);
 
         if (!flp->initialized)
                 return(-EINVAL);
@@ -1321,7 +1321,7 @@ static int sdla_change_mtu(struct net_device *dev, int new_mtu)
 {
         struct frad_local *flp;
 
-        flp = dev->priv;
+        flp = netdev_priv(dev);
 
         if (netif_running(dev))
                 return(-EBUSY);
@@ -1338,7 +1338,7 @@ static int sdla_set_config(struct net_device *dev, struct ifmap *map)
         unsigned base;
         int err = -EINVAL;
 
-        flp = dev->priv;
+        flp = netdev_priv(dev);
 
         if (flp->initialized)
                 return(-EINVAL);
@@ -1593,14 +1593,14 @@ fail:
 static struct net_device_stats *sdla_stats(struct net_device *dev)
 {
         struct frad_local *flp;
-        flp = dev->priv;
+        flp = netdev_priv(dev);
 
         return(&flp->stats);
 }
 
 static void setup_sdla(struct net_device *dev)
 {
-        struct frad_local *flp = dev->priv;
+        struct frad_local *flp = netdev_priv(dev);
 
         netdev_boot_setup_check(dev);
 
@@ -1651,7 +1651,7 @@ static int __init init_sdla(void)
 
 static void __exit exit_sdla(void)
 {
-        struct frad_local *flp = sdla->priv;
+        struct frad_local *flp = netdev_priv(sdla);
 
         unregister_netdev(sdla);
         if (flp->initialized) {
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 3b7bdfd25148..85d789147300 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -64,7 +64,7 @@ static struct x25_asy *x25_asy_alloc(void)
                 if (dev == NULL)
                         break;
 
-                sl = dev->priv;
+                sl = netdev_priv(dev);
                 /* Not in use ? */
                 if (!test_and_set_bit(SLF_INUSE, &sl->flags))
                         return sl;
@@ -86,7 +86,7 @@ static struct x25_asy *x25_asy_alloc(void)
                         return NULL;
 
                 /* Initialize channel control data */
-                sl = dev->priv;
+                sl = netdev_priv(dev);
                 dev->base_addr    = i;
 
                 /* register device so that it can be ifconfig'ed       */
@@ -120,7 +120,7 @@ static void x25_asy_free(struct x25_asy *sl)
 
 static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         unsigned char *xbuff, *rbuff;
         int len = 2 * newmtu;
 
@@ -279,7 +279,7 @@ static void x25_asy_write_wakeup(struct tty_struct *tty)
 
 static void x25_asy_timeout(struct net_device *dev)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
 
         spin_lock(&sl->lock);
         if (netif_queue_stopped(dev)) {
@@ -300,7 +300,7 @@ static void x25_asy_timeout(struct net_device *dev)
 
 static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         int err;
 
         if (!netif_running(sl->dev)) {
@@ -371,7 +371,7 @@ static int x25_asy_data_indication(struct net_device *dev, struct sk_buff *skb)
 
 static void x25_asy_data_transmit(struct net_device *dev, struct sk_buff *skb)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
 
         spin_lock(&sl->lock);
         if (netif_queue_stopped(sl->dev) || sl->tty == NULL) {
@@ -396,7 +396,7 @@ static void x25_asy_data_transmit(struct net_device *dev, struct sk_buff *skb)
 
 static void x25_asy_connected(struct net_device *dev, int reason)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         struct sk_buff *skb;
         unsigned char *ptr;
 
@@ -415,7 +415,7 @@ static void x25_asy_connected(struct net_device *dev, int reason)
 
 static void x25_asy_disconnected(struct net_device *dev, int reason)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         struct sk_buff *skb;
         unsigned char *ptr;
 
@@ -446,7 +446,7 @@ static struct lapb_register_struct x25_asy_callbacks = {
 /* Open the low-level part of the X.25 channel. Easy! */
 static int x25_asy_open(struct net_device *dev)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         unsigned long len;
         int err;
 
@@ -495,7 +495,7 @@ norbuff:
 /* Close the low-level part of the X.25 channel. Easy! */
 static int x25_asy_close(struct net_device *dev)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         int err;
 
         spin_lock(&sl->lock);
@@ -611,7 +611,7 @@ static void x25_asy_close_tty(struct tty_struct *tty)
 
 static struct net_device_stats *x25_asy_get_stats(struct net_device *dev)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         return &sl->stats;
 }
 
@@ -713,7 +713,7 @@ static int x25_asy_ioctl(struct tty_struct *tty, struct file *file,
 
 static int x25_asy_open_dev(struct net_device *dev)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
         if (sl->tty == NULL)
                 return -ENODEV;
         return 0;
@@ -722,7 +722,7 @@ static int x25_asy_open_dev(struct net_device *dev)
 /* Initialise the X.25 driver.  Called by the device init code */
 static void x25_asy_setup(struct net_device *dev)
 {
-        struct x25_asy *sl = dev->priv;
+        struct x25_asy *sl = netdev_priv(dev);
 
         sl->magic  = X25_ASY_MAGIC;
         sl->dev    = dev;
@@ -789,7 +789,7 @@ static void __exit exit_x25_asy(void)
         for (i = 0; i < x25_asy_maxdev; i++) {
                 dev = x25_asy_devs[i];
                 if (dev) {
-                        struct x25_asy *sl = dev->priv;
+                        struct x25_asy *sl = netdev_priv(dev);
 
                         spin_lock_bh(&sl->lock);
                         if (sl->tty)