diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-26 12:16:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-26 12:16:46 -0700 |
| commit | 2bd93d7af1581d40e3c4b25242472661cb7c637a (patch) | |
| tree | 43c638422d20857339d8d908d6b65ebb8045edc0 /drivers/net/bonding/bond_3ad.c | |
| parent | 64cad2ade1e6f890531a58318ca9ee013f92ef2f (diff) | |
| parent | 0972ddb2373d5e127aabdcabd8305eff0242cd0b (diff) | |
| download | linux-2bd93d7af1581d40e3c4b25242472661cb7c637a.tar.gz linux-2bd93d7af1581d40e3c4b25242472661cb7c637a.tar.bz2 linux-2bd93d7af1581d40e3c4b25242472661cb7c637a.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_3ad.c')
| -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 d0981c2ffbda..d4160f87e910 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -1480,8 +1480,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)); } /** |