diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-03-16 08:46:43 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-16 19:51:20 (GMT) |
commit | 2d7011ca79f1a8792e04d131b8ea21db179ab917 (patch) | |
tree | 5c9c43a4d02c75b3c46e9fff94bb3f77c0607cd7 /drivers/net/bonding/bond_sysfs.c | |
parent | e30bc066ab67a4c8abcb972227ffe7c576f06a86 (diff) | |
download | linux-fsl-qoriq-2d7011ca79f1a8792e04d131b8ea21db179ab917.tar.xz |
bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
Since bond-related code was moved from net/core/dev.c into bonding,
IFF_SLAVE_INACTIVE is no longer needed. Replace is with flag "inactive"
stored in slave structure
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/bond_sysfs.c')
-rw-r--r-- | drivers/net/bonding/bond_sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index c81b97c..de87aea 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -1584,9 +1584,9 @@ static ssize_t bonding_store_slaves_active(struct device *d, bond_for_each_slave(bond, slave, i) { if (!bond_is_active_slave(slave)) { if (new_value) - slave->dev->priv_flags &= ~IFF_SLAVE_INACTIVE; + slave->inactive = 0; else - slave->dev->priv_flags |= IFF_SLAVE_INACTIVE; + slave->inactive = 1; } } out: |