diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-03-16 08:45:23 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-16 12:51:19 -0700 |
| commit | 0bd80dad57d82676ee484fb1f9aa4c5e8b5bc469 (patch) | |
| tree | f74ad36f8ab30ef3cff0404946cb440744d2b8b5 /drivers/net/bonding/bonding.h | |
| parent | f1c1775ac7e61950225925c949045406ffcb43de (diff) | |
| download | op-kernel-dev-0bd80dad57d82676ee484fb1f9aa4c5e8b5bc469.zip op-kernel-dev-0bd80dad57d82676ee484fb1f9aa4c5e8b5bc469.tar.gz | |
net: get rid of multiple bond-related netdevice->priv_flags
Now when bond-related code is moved from net/core/dev.c into bonding
code, multiple priv_flags are not needed anymore. So let them rot.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Reviewed-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
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 | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index ff9af31..049619f 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -356,34 +356,12 @@ static inline void bond_set_slave_inactive_flags(struct slave *slave) slave->state = BOND_STATE_BACKUP; if (!bond->params.all_slaves_active) slave->dev->priv_flags |= IFF_SLAVE_INACTIVE; - if (slave_do_arp_validate(bond, slave)) - slave->dev->priv_flags |= IFF_SLAVE_NEEDARP; } static inline void bond_set_slave_active_flags(struct slave *slave) { slave->state = BOND_STATE_ACTIVE; - slave->dev->priv_flags &= ~(IFF_SLAVE_INACTIVE | IFF_SLAVE_NEEDARP); -} - -static inline void bond_set_master_3ad_flags(struct bonding *bond) -{ - bond->dev->priv_flags |= IFF_MASTER_8023AD; -} - -static inline void bond_unset_master_3ad_flags(struct bonding *bond) -{ - bond->dev->priv_flags &= ~IFF_MASTER_8023AD; -} - -static inline void bond_set_master_alb_flags(struct bonding *bond) -{ - bond->dev->priv_flags |= IFF_MASTER_ALB; -} - -static inline void bond_unset_master_alb_flags(struct bonding *bond) -{ - bond->dev->priv_flags &= ~IFF_MASTER_ALB; + slave->dev->priv_flags &= ~IFF_SLAVE_INACTIVE; } struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr); |
