diff options
| author | Jiri Bohac <jbohac@suse.cz> | 2011-04-19 02:09:55 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-20 01:44:43 -0700 |
| commit | 2430af8b7fa37ac0be102c77f9dc6ee669d24ba9 (patch) | |
| tree | 76199ce83fd1ef26f1438302fb2f4898f537531d /drivers/net | |
| parent | 6f4d6dc167a001267eeff18bdea0ce3e9108c662 (diff) | |
| download | linux-stable-2430af8b7fa37ac0be102c77f9dc6ee669d24ba9.tar.gz linux-stable-2430af8b7fa37ac0be102c77f9dc6ee669d24ba9.tar.bz2 linux-stable-2430af8b7fa37ac0be102c77f9dc6ee669d24ba9.zip | |
bonding: 802.3ad - fix agg_device_up
The slave member of struct aggregator does not necessarily point
to a slave which is part of the aggregator. It points to the
slave structure containing the aggregator structure, while
completely different slaves (or no slaves at all) may be part of
the aggregator.
The agg_device_up() function wrongly uses agg->slave to find the state
of the aggregator. Use agg->lag_ports->slave instead. The bug has
been introduced by commit 4cd6fe1c6483cde93e2ec91f58b7af9c9eea51ad
("bonding: fix link down handling in 802.3ad mode").
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bonding/bond_3ad.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index 494bf960442d..31912f17653f 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -1482,8 +1482,11 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best, static int agg_device_up(const struct aggregator *agg) { - return (netif_running(agg->slave->dev) && - netif_carrier_ok(agg->slave->dev)); + struct port *port = agg->lag_ports; + if (!port) + return 0; + return (netif_running(port->slave->dev) && + netif_carrier_ok(port->slave->dev)); } /** |