aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_sysfs.c
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2011-03-16 04:46:43 -0400
committerDavid S. Miller <davem@davemloft.net>2011-03-16 15:51:20 -0400
commit2d7011ca79f1a8792e04d131b8ea21db179ab917 (patch)
tree5c9c43a4d02c75b3c46e9fff94bb3f77c0607cd7 /drivers/net/bonding/bond_sysfs.c
parente30bc066ab67a4c8abcb972227ffe7c576f06a86 (diff)
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index c81b97cffaa3..de87aea6d01a 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,
1584 bond_for_each_slave(bond, slave, i) { 1584 bond_for_each_slave(bond, slave, i) {
1585 if (!bond_is_active_slave(slave)) { 1585 if (!bond_is_active_slave(slave)) {
1586 if (new_value) 1586 if (new_value)
1587 slave->dev->priv_flags &= ~IFF_SLAVE_INACTIVE; 1587 slave->inactive = 0;
1588 else 1588 else
1589 slave->dev->priv_flags |= IFF_SLAVE_INACTIVE; 1589 slave->inactive = 1;
1590 } 1590 }
1591 } 1591 }
1592out: 1592out: