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/bonding.h | |
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/bonding.h')
-rw-r--r-- | drivers/net/bonding/bonding.h | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
257 | return NULL; | 257 | return NULL; |
258 | } | 258 | } |
259 | 259 | ||
260 | return (struct bonding *)slave->dev->master->priv; | 260 | return (struct bonding *)netdev_priv(slave->dev->master); |
261 | } | 261 | } |
262 | 262 | ||
263 | #define BOND_FOM_NONE 0 | 263 | #define BOND_FOM_NONE 0 |
@@ -287,7 +287,7 @@ static inline unsigned long slave_last_rx(struct bonding *bond, | |||
287 | 287 | ||
288 | static inline void bond_set_slave_inactive_flags(struct slave *slave) | 288 | static inline void bond_set_slave_inactive_flags(struct slave *slave) |
289 | { | 289 | { |
290 | struct bonding *bond = slave->dev->master->priv; | 290 | struct bonding *bond = netdev_priv(slave->dev->master); |
291 | if (bond->params.mode != BOND_MODE_TLB && | 291 | if (bond->params.mode != BOND_MODE_TLB && |
292 | bond->params.mode != BOND_MODE_ALB) | 292 | bond->params.mode != BOND_MODE_ALB) |
293 | slave->state = BOND_STATE_BACKUP; | 293 | slave->state = BOND_STATE_BACKUP; |