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>

5 files changed, 39 insertions, 38 deletions

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index ba1372f2f144..78f645d6471a 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2426,7 +2426,7 @@ int bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info)
 int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
 {
         struct slave *slave, *start_at;
-        struct bonding *bond = dev->priv;
+        struct bonding *bond = netdev_priv(dev);
         int slave_agg_no;
         int slaves_in_agg;
         int agg_id;
@@ -2506,7 +2506,7 @@ out:
 
 int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype, struct net_device *orig_dev)
 {
-        struct bonding *bond = dev->priv;
+        struct bonding *bond = netdev_priv(dev);
         struct slave *slave = NULL;
         int ret = NET_RX_DROP;
 
@@ -2517,7 +2517,8 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac
                 goto out;
 
         read_lock(&bond->lock);
-        slave = bond_get_slave_by_dev((struct bonding *)dev->priv, orig_dev);
+        slave = bond_get_slave_by_dev((struct bonding *)netdev_priv(dev),
+                                        orig_dev);
         if (!slave)
                 goto out_unlock;
 
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index e170fa2fa1a1..073d25f357bb 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -374,7 +374,7 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
                 /* update rx hash table for this ARP */
                 printk("rar: update orig %s bond_dev %s\n", orig_dev->name,
                        bond_dev->name);
-                bond = bond_dev->priv;
+                bond = netdev_priv(bond_dev);
                 rlb_update_entry_from_arp(bond, arp);
                 dprintk("Server received an ARP Reply from client\n");
         }
@@ -1292,7 +1292,7 @@ void bond_alb_deinitialize(struct bonding *bond)
 
 int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct ethhdr *eth_data;
         struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
         struct slave *tx_slave = NULL;
@@ -1713,7 +1713,7 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave
  */
 int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct sockaddr *sa = addr;
         struct slave *slave, *swap_slave;
         int res;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 02de3e031237..a08ea4808056 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -454,7 +454,7 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_de
  */
 static void bond_vlan_rx_register(struct net_device *bond_dev, struct vlan_group *grp)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct slave *slave;
         int i;
 
@@ -477,7 +477,7 @@ static void bond_vlan_rx_register(struct net_device *bond_dev, struct vlan_group
  */
 static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct slave *slave;
         int i, res;
 
@@ -505,7 +505,7 @@ static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)
  */
 static void bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct slave *slave;
         struct net_device *vlan_dev;
         int i, res;
@@ -939,7 +939,7 @@ static int bond_mc_list_copy(struct dev_mc_list *mc_list, struct bonding *bond,
  */
 static void bond_mc_list_flush(struct net_device *bond_dev, struct net_device *slave_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct dev_mc_list *dmi;
 
         for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next) {
@@ -1383,7 +1383,7 @@ done:
 static void bond_setup_by_slave(struct net_device *bond_dev,
                                 struct net_device *slave_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
 
         bond_dev->neigh_setup           = slave_dev->neigh_setup;
         bond_dev->header_ops            = slave_dev->header_ops;
@@ -1400,7 +1400,7 @@ static void bond_setup_by_slave(struct net_device *bond_dev,
 /* enslave device <slave> to bond device <master> */
 int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct slave *new_slave = NULL;
         struct dev_mc_list *dmi;
         struct sockaddr addr;
@@ -1802,7 +1802,7 @@ err_undo_flags:
  */
 int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct slave *slave, *oldcurrent;
         struct sockaddr addr;
         int mac_addr_differ;
@@ -2013,7 +2013,7 @@ static void bond_destructor(struct net_device *bond_dev)
 */
 int  bond_release_and_destroy(struct net_device *bond_dev, struct net_device *slave_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         int ret;
 
         ret = bond_release(bond_dev, slave_dev);
@@ -2030,7 +2030,7 @@ int  bond_release_and_destroy(struct net_device *bond_dev, struct net_device *sl
  */
 static int bond_release_all(struct net_device *bond_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct slave *slave;
         struct net_device *slave_dev;
         struct sockaddr addr;
@@ -2161,7 +2161,7 @@ out:
  */
 static int bond_ioctl_change_active(struct net_device *bond_dev, struct net_device *slave_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct slave *old_active = NULL;
         struct slave *new_active = NULL;
         int res = 0;
@@ -2210,7 +2210,7 @@ static int bond_ioctl_change_active(struct net_device *bond_dev, struct net_devi
 
 static int bond_info_query(struct net_device *bond_dev, struct ifbond *info)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
 
         info->bond_mode = bond->params.mode;
         info->miimon = bond->params.miimon;
@@ -2224,7 +2224,7 @@ static int bond_info_query(struct net_device *bond_dev, struct ifbond *info)
 
 static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *info)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct slave *slave;
         int i, found = 0;
 
@@ -2717,7 +2717,7 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
         if (!(dev->priv_flags & IFF_BONDING) || !(dev->flags & IFF_MASTER))
                 goto out;
 
-        bond = dev->priv;
+        bond = netdev_priv(dev);
         read_lock(&bond->lock);
 
         dprintk("bond_arp_rcv: bond %s skb->dev %s orig_dev %s\n",
@@ -3526,7 +3526,7 @@ static int bond_event_changename(struct bonding *bond)
 
 static int bond_master_netdev_event(unsigned long event, struct net_device *bond_dev)
 {
-        struct bonding *event_bond = bond_dev->priv;
+        struct bonding *event_bond = netdev_priv(bond_dev);
 
         switch (event) {
         case NETDEV_CHANGENAME:
@@ -3544,7 +3544,7 @@ static int bond_master_netdev_event(unsigned long event, struct net_device *bond
 static int bond_slave_netdev_event(unsigned long event, struct net_device *slave_dev)
 {
         struct net_device *bond_dev = slave_dev->master;
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
 
         switch (event) {
         case NETDEV_UNREGISTER:
@@ -3795,7 +3795,7 @@ static int bond_xmit_hash_policy_l2(struct sk_buff *skb,
 
 static int bond_open(struct net_device *bond_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
 
         bond->kill_timers = 0;
 
@@ -3844,7 +3844,7 @@ static int bond_open(struct net_device *bond_dev)
 
 static int bond_close(struct net_device *bond_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 /* Unregister the receive of LACPDUs */
@@ -3898,7 +3898,7 @@ static int bond_close(struct net_device *bond_dev)
 
 static struct net_device_stats *bond_get_stats(struct net_device *bond_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct net_device_stats *stats = &(bond->stats), *sstats;
         struct net_device_stats local_stats;
         struct slave *slave;
@@ -3976,7 +3976,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
                 }
 
                 if (mii->reg_num == 1) {
-                        struct bonding *bond = bond_dev->priv;
+                        struct bonding *bond = netdev_priv(bond_dev);
                         mii->val_out = 0;
                         read_lock(&bond->lock);
                         read_lock(&bond->curr_slave_lock);
@@ -4068,7 +4068,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
 
 static void bond_set_multicast_list(struct net_device *bond_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct dev_mc_list *dmi;
 
         /*
@@ -4129,7 +4129,7 @@ static void bond_set_multicast_list(struct net_device *bond_dev)
  */
 static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct slave *slave, *stop_at;
         int res = 0;
         int i;
@@ -4201,7 +4201,7 @@ unwind:
  */
 static int bond_set_mac_address(struct net_device *bond_dev, void *addr)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct sockaddr *sa = addr, tmp_sa;
         struct slave *slave, *stop_at;
         int res = 0;
@@ -4282,7 +4282,7 @@ unwind:
 
 static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct slave *slave, *start_at;
         int i, slave_no, res = 1;
 
@@ -4331,7 +4331,7 @@ out:
  */
 static int bond_xmit_activebackup(struct sk_buff *skb, struct net_device *bond_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         int res = 1;
 
         read_lock(&bond->lock);
@@ -4363,7 +4363,7 @@ out:
  */
 static int bond_xmit_xor(struct sk_buff *skb, struct net_device *bond_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct slave *slave, *start_at;
         int slave_no;
         int i;
@@ -4409,7 +4409,7 @@ out:
  */
 static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
         struct slave *slave, *start_at;
         struct net_device *tx_dev = NULL;
         int i;
@@ -4552,7 +4552,7 @@ static const struct ethtool_ops bond_ethtool_ops = {
  */
 static int bond_init(struct net_device *bond_dev, struct bond_params *params)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
 
         dprintk("Begin bond_init for %s\n", bond_dev->name);
 
@@ -4657,7 +4657,7 @@ static void bond_work_cancel_all(struct bonding *bond)
  */
 static void bond_deinit(struct net_device *bond_dev)
 {
-        struct bonding *bond = bond_dev->priv;
+        struct bonding *bond = netdev_priv(bond_dev);
 
         list_del(&bond->bond_list);
 
@@ -5149,7 +5149,7 @@ int bond_create(char *name, struct bond_params *params)
 
         up_write(&bonding_rwsem);
         rtnl_unlock(); /* allows sysfs registration of net device */
-        res = bond_create_sysfs_entry(bond_dev->priv);
+        res = bond_create_sysfs_entry(netdev_priv(bond_dev));
         if (res < 0) {
                 rtnl_lock();
                 down_write(&bonding_rwsem);
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index aaf2927b5c38..fc490d89d4af 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -39,7 +39,7 @@
 /* #define BONDING_DEBUG 1 */
 #include "bonding.h"
 #define to_dev(obj)     container_of(obj,struct device,kobj)
-#define to_bond(cd)     ((struct bonding *)(to_net_dev(cd)->priv))
+#define to_bond(cd)     ((struct bonding *)(netdev_priv(to_net_dev(cd))))
 
 /*---------------------------- Declarations -------------------------------*/
 
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index b5eb8e65b309..921abacc6074 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -257,7 +257,7 @@ static inline struct bonding *bond_get_bond_by_slave(struct slave *slave)
                 return NULL;
         }
 
-        return (struct bonding *)slave->dev->master->priv;
+        return (struct bonding *)netdev_priv(slave->dev->master);
 }
 
 #define BOND_FOM_NONE                   0
@@ -287,7 +287,7 @@ static inline unsigned long slave_last_rx(struct bonding *bond,
 
 static inline void bond_set_slave_inactive_flags(struct slave *slave)
 {
-        struct bonding *bond = slave->dev->master->priv;
+        struct bonding *bond = netdev_priv(slave->dev->master);
         if (bond->params.mode != BOND_MODE_TLB &&
             bond->params.mode != BOND_MODE_ALB)
                 slave->state = BOND_STATE_BACKUP;