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

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>

2 files changed, 11 insertions, 7 deletions

diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index 1071144edd66..9a0be9b2eaad 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -108,7 +108,7 @@ static struct net_device * __init ipddp_init(void)
  */
 static struct net_device_stats *ipddp_get_stats(struct net_device *dev)
 {
-        return dev->priv;
+        return netdev_priv(dev);
 }
 
 /*
@@ -170,8 +170,8 @@ static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev)
 
         skb->protocol = htons(ETH_P_ATALK);     /* Protocol has changed */
 
-        ((struct net_device_stats *) dev->priv)->tx_packets++;
-        ((struct net_device_stats *) dev->priv)->tx_bytes+=skb->len;
+        ((struct net_device_stats *) netdev_priv(dev))->tx_packets++;
+        ((struct net_device_stats *) netdev_priv(dev))->tx_bytes += skb->len;
 
         if(aarp_send_ddp(rt->dev, skb, &rt->at, NULL) < 0)
                 dev_kfree_skb(skb);
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 8d109a5f5571..dc4d49605603 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -726,7 +726,8 @@ static int sendup_buffer (struct net_device *dev)
         int dnode, snode, llaptype, len; 
         int sklen;
         struct sk_buff *skb;
-        struct net_device_stats *stats = &((struct ltpc_private *)dev->priv)->stats;
+        struct ltpc_private *ltpc_priv = netdev_priv(dev);
+        struct net_device_stats *stats = &ltpc_priv->stats;
         struct lt_rcvlap *ltc = (struct lt_rcvlap *) ltdmacbuf;
 
         if (ltc->command != LT_RCVLAP) {
@@ -822,7 +823,8 @@ static int ltpc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
         struct sockaddr_at *sa = (struct sockaddr_at *) &ifr->ifr_addr;
         /* we'll keep the localtalk node address in dev->pa_addr */
-        struct atalk_addr *aa = &((struct ltpc_private *)dev->priv)->my_addr;
+        struct ltpc_private *ltpc_priv = netdev_priv(dev);
+        struct atalk_addr *aa = &ltpc_priv->my_addr;
         struct lt_init c;
         int ltflags;
 
@@ -903,7 +905,8 @@ static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev)
          * and skb->len is the length of the ddp data + ddp header
          */
 
-        struct net_device_stats *stats = &((struct ltpc_private *)dev->priv)->stats;
+        struct ltpc_private *ltpc_priv = netdev_priv(dev);
+        struct net_device_stats *stats = &ltpc_priv->stats;
 
         int i;
         struct lt_sendlap cbuf;
@@ -942,7 +945,8 @@ static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static struct net_device_stats *ltpc_get_stats(struct net_device *dev)
 {
-        struct net_device_stats *stats = &((struct ltpc_private *) dev->priv)->stats;
+        struct ltpc_private *ltpc_priv = netdev_priv(dev);
+        struct net_device_stats *stats = &ltpc_priv->stats;
         return stats;
 }