X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fbond.h;h=f80feadbcd0ac8280940b7c90073bcd9879d0b60;hb=34290dbfe54a930258d4c1d00e82e7c3f51cea5f;hp=7329db7c0a97e3ac1ad9ac33da5e6b3d35150d7c;hpb=8706009e555bb9fa04a5679e4be2c7c67506802b;p=sliver-openvswitch.git

diff --git a/lib/bond.h b/lib/bond.h
index 7329db7c0..f80feadbc 100644
--- a/lib/bond.h
+++ b/lib/bond.h
@@ -21,7 +21,6 @@
 #include <stdint.h>
 
 #include "packets.h"
-#include "tag.h"
 
 struct flow;
 struct netdev;
@@ -32,7 +31,6 @@ enum lacp_status;
 enum bond_mode {
     BM_TCP, /* Transport Layer Load Balance. */
     BM_SLB, /* Source Load Balance. */
-    BM_STABLE, /* Stable. */
     BM_AB   /* Active Backup. */
 };
 
@@ -62,15 +60,15 @@ void bond_init(void);
 
 /* Basics. */
 struct bond *bond_create(const struct bond_settings *);
-void bond_destroy(struct bond *);
+void bond_unref(struct bond *);
+struct bond *bond_ref(const struct bond *);
 
 bool bond_reconfigure(struct bond *, const struct bond_settings *);
-void bond_slave_register(struct bond *, void *slave_,
-                         uint32_t stable_id, struct netdev *);
+void bond_slave_register(struct bond *, void *slave_, struct netdev *);
 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 *, enum lacp_status);
+bool bond_run(struct bond *, enum lacp_status);
 void bond_wait(struct bond *);
 
 void bond_slave_set_may_enable(struct bond *, void *slave_, bool may_enable);
@@ -88,14 +86,13 @@ enum bond_verdict {
     BV_DROP_IF_MOVED            /* Drop if we've learned a different port. */
 };
 enum bond_verdict bond_check_admissibility(struct bond *, const void *slave_,
-                                           const uint8_t eth_dst[ETH_ADDR_LEN],
-                                           tag_type *);
-void *bond_choose_output_slave(struct bond *,
-                               const struct flow *, uint16_t vlan, tag_type *);
+                                           const uint8_t dst[ETH_ADDR_LEN]);
+void *bond_choose_output_slave(struct bond *, const struct flow *,
+                               struct flow_wildcards *, uint16_t vlan);
 
 /* Rebalancing. */
 void bond_account(struct bond *, const struct flow *, uint16_t vlan,
                   uint64_t n_bytes);
-void bond_rebalance(struct bond *, struct tag_set *);
+void bond_rebalance(struct bond *);
 
 #endif /* bond.h */