aboutsummaryrefslogtreecommitdiff
path: root/lib/bond.h
diff options
context:
space:
mode:
authorEthan Jackson <ethan@nicira.com>2011-04-14 16:50:26 -0700
committerEthan Jackson <ethan@nicira.com>2011-04-15 12:19:26 -0700
commit4d6fb5ebd0355a7843c01185631bba694ffeb209 (patch)
treefc194cdaf587f775f945a25d046dfce35f7d74d8 /lib/bond.h
parente1e90548952cbf11c5d2cf32e1d20b160130572d (diff)
bond: Completely pull LACP module out of bond.
The bonding code only needs to know whether a given slave may be enabled, and whether LACP has been negotiated on the bond. Instead of passing in the LACP handle and letting the bond query this information. This patch passes in the information directly.
Diffstat (limited to 'lib/bond.h')
-rw-r--r--lib/bond.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/bond.h b/lib/bond.h
index e3690cee..b2ab89cd 100644
--- a/lib/bond.h
+++ b/lib/bond.h
@@ -63,8 +63,6 @@ struct bond_settings {
/* Legacy compatibility. */
bool fake_iface; /* Update fake stats for netdev 'name'? */
-
- const struct lacp *lacp; /* LACP for this bond. May be NULL. */
};
/* Program startup. */
@@ -79,9 +77,13 @@ void bond_slave_register(struct bond *, void *slave_,
uint16_t stable_id, struct netdev *);
void bond_slave_unregister(struct bond *, const void *slave);
-void bond_run(struct bond *, struct tag_set *);
+void bond_run(struct bond *, struct tag_set *, bool lacp_negotiated);
void bond_wait(struct bond *);
+/* LACP. */
+void bond_slave_set_lacp_may_enable(struct bond *, void *slave_,
+ bool may_enable);
+
/* Special MAC learning support for SLB bonding. */
bool bond_should_send_learning_packets(struct bond *);
int bond_send_learning_packet(struct bond *,