aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_3ad.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/bonding/bond_3ad.c')
-rw-r--r--drivers/net/bonding/bond_3ad.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index c3fa31c9f2a..3cd8153b906 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -1956,7 +1956,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
1956 struct port *port, *prev_port, *temp_port; 1956 struct port *port, *prev_port, *temp_port;
1957 struct aggregator *aggregator, *new_aggregator, *temp_aggregator; 1957 struct aggregator *aggregator, *new_aggregator, *temp_aggregator;
1958 int select_new_active_agg = 0; 1958 int select_new_active_agg = 0;
1959 1959
1960 // find the aggregator related to this slave 1960 // find the aggregator related to this slave
1961 aggregator = &(SLAVE_AD_INFO(slave).aggregator); 1961 aggregator = &(SLAVE_AD_INFO(slave).aggregator);
1962 1962
@@ -2024,7 +2024,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
2024 2024
2025 // clear the aggregator 2025 // clear the aggregator
2026 ad_clear_agg(aggregator); 2026 ad_clear_agg(aggregator);
2027 2027
2028 if (select_new_active_agg) { 2028 if (select_new_active_agg) {
2029 ad_agg_selection_logic(__get_first_agg(port)); 2029 ad_agg_selection_logic(__get_first_agg(port));
2030 } 2030 }
@@ -2075,7 +2075,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
2075 } 2075 }
2076 } 2076 }
2077 } 2077 }
2078 port->slave=NULL; 2078 port->slave=NULL;
2079} 2079}
2080 2080
2081/** 2081/**
@@ -2301,7 +2301,7 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
2301} 2301}
2302 2302
2303/* 2303/*
2304 * set link state for bonding master: if we have an active 2304 * set link state for bonding master: if we have an active
2305 * aggregator, we're up, if not, we're down. Presumes that we cannot 2305 * aggregator, we're up, if not, we're down. Presumes that we cannot
2306 * have an active aggregator if there are no slaves with link up. 2306 * have an active aggregator if there are no slaves with link up.
2307 * 2307 *
@@ -2395,7 +2395,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
2395 goto out; 2395 goto out;
2396 } 2396 }
2397 2397
2398 slave_agg_no = bond->xmit_hash_policy(skb, dev, slaves_in_agg); 2398 slave_agg_no = bond->xmit_hash_policy(skb, slaves_in_agg);
2399 2399
2400 bond_for_each_slave(bond, slave, i) { 2400 bond_for_each_slave(bond, slave, i) {
2401 struct aggregator *agg = SLAVE_AD_INFO(slave).port.aggregator; 2401 struct aggregator *agg = SLAVE_AD_INFO(slave).port.aggregator;
@@ -2468,4 +2468,3 @@ out:
2468 2468
2469 return ret; 2469 return ret;
2470} 2470}
2471