diff options
author | Wang Chen <wangchen@cn.fujitsu.com> | 2008-11-13 02:37:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-13 02:37:49 -0500 |
commit | 454d7c9b14e20fd1949e2686e9de4a2926e01476 (patch) | |
tree | fae8bd1bfb5fd496977a0639ad71c54a2ee278ae /drivers/net/bonding/bond_alb.c | |
parent | 7a12122c7a00347da9669cfcde82954c9e3d6f5e (diff) |
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>
Diffstat (limited to 'drivers/net/bonding/bond_alb.c')
-rw-r--r-- | drivers/net/bonding/bond_alb.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
374 | /* update rx hash table for this ARP */ | 374 | /* update rx hash table for this ARP */ |
375 | printk("rar: update orig %s bond_dev %s\n", orig_dev->name, | 375 | printk("rar: update orig %s bond_dev %s\n", orig_dev->name, |
376 | bond_dev->name); | 376 | bond_dev->name); |
377 | bond = bond_dev->priv; | 377 | bond = netdev_priv(bond_dev); |
378 | rlb_update_entry_from_arp(bond, arp); | 378 | rlb_update_entry_from_arp(bond, arp); |
379 | dprintk("Server received an ARP Reply from client\n"); | 379 | dprintk("Server received an ARP Reply from client\n"); |
380 | } | 380 | } |
@@ -1292,7 +1292,7 @@ void bond_alb_deinitialize(struct bonding *bond) | |||
1292 | 1292 | ||
1293 | int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) | 1293 | int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) |
1294 | { | 1294 | { |
1295 | struct bonding *bond = bond_dev->priv; | 1295 | struct bonding *bond = netdev_priv(bond_dev); |
1296 | struct ethhdr *eth_data; | 1296 | struct ethhdr *eth_data; |
1297 | struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); | 1297 | struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); |
1298 | struct slave *tx_slave = NULL; | 1298 | struct slave *tx_slave = NULL; |
@@ -1713,7 +1713,7 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave | |||
1713 | */ | 1713 | */ |
1714 | int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) | 1714 | int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) |
1715 | { | 1715 | { |
1716 | struct bonding *bond = bond_dev->priv; | 1716 | struct bonding *bond = netdev_priv(bond_dev); |
1717 | struct sockaddr *sa = addr; | 1717 | struct sockaddr *sa = addr; |
1718 | struct slave *slave, *swap_slave; | 1718 | struct slave *slave, *swap_slave; |
1719 | int res; | 1719 | int res; |