X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbond.h;h=6d8161d82ff6820a5a21749a5ca3606529a1c8ec;hb=541bc79f73add327072470c9bc3febb4195cdb3c;hp=56ca5b98a997ce7eafdf5c4da7fc85100ff5a2a7;hpb=1670c579a82921fedd8b2c20818919f6b5a9c330;p=openvswitch

diff --git a/lib/bond.h b/lib/bond.h
index 56ca5b98..6d8161d8 100644
--- a/lib/bond.h
+++ b/lib/bond.h
@@ -26,6 +26,7 @@
 struct flow;
 struct netdev;
 struct ofpbuf;
+enum lacp_status;
 
 /* How flows are balanced among bond slaves. */
 enum bond_mode {
@@ -45,7 +46,8 @@ struct bond_settings {
 
     /* Balancing configuration. */
     enum bond_mode balance;
-    int rebalance_interval;     /* Milliseconds between rebalances. */
+    int rebalance_interval;     /* Milliseconds between rebalances.
+                                   Zero to disable rebalancing. */
 
     /* Link status detection. */
     int up_delay;               /* ms before enabling an up slave. */
@@ -68,18 +70,16 @@ void bond_slave_register(struct bond *, void *slave_,
 void bond_slave_set_netdev(struct bond *, void *slave_, struct netdev *);
 void bond_slave_unregister(struct bond *, const void *slave);
 
-void bond_run(struct bond *, struct tag_set *, bool lacp_negotiated);
+void bond_run(struct bond *, struct tag_set *, enum lacp_status);
 void bond_wait(struct bond *);
 
-/* LACP. */
-void bond_slave_set_lacp_may_enable(struct bond *, void *slave_,
-                                    bool may_enable);
+void bond_slave_set_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 *,
-                              const uint8_t eth_src[ETH_ADDR_LEN],
-                              uint16_t vlan);
+struct ofpbuf *bond_compose_learning_packet(struct bond *,
+                                            const uint8_t eth_src[ETH_ADDR_LEN],
+                                            uint16_t vlan, void **port_aux);
 
 /* Packet processing. */
 enum bond_verdict {