git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
drivers
/
net
/
bonding
/
bond_3ad.c
diff --git
a/drivers/net/bonding/bond_3ad.c
b/drivers/net/bonding/bond_3ad.c
index
494bf96
..
31912f1
100644
(file)
--- 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)
{
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));
}
/**
}
/**