tnl-arp-cache: Rename module and functions to tnl-neigh-cache.

[cascardo/ovs.git] / ofproto / bond.h

diff --git a/ofproto/bond.h b/ofproto/bond.h
index e5ceb45..9a5ea9e 100644 (file)
--- a/ofproto/bond.h
+++ b/ofproto/bond.h
@@ -52,9 +52,12 @@ struct bond_settings {
     int up_delay;               /* ms before enabling an up slave. */
     int down_delay;             /* ms before disabling a down slave. */
 
-    /* Legacy compatibility. */
-    bool fake_iface;            /* Update fake stats for netdev 'name'? */
     bool lacp_fallback_ab_cfg;  /* Fallback to active-backup on LACP failure. */
+
+    struct eth_addr active_slave_mac;
+                                /* The MAC address of the interface
+                                   that was active during the last
+                                   ovs run. */
 };
 
 /* Program startup. */
@@ -78,9 +81,11 @@ 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 *);
-struct ofpbuf *bond_compose_learning_packet(struct bond *,
-                                            const uint8_t eth_src[ETH_ADDR_LEN],
-                                            uint16_t vlan, void **port_aux);
+struct dp_packet *bond_compose_learning_packet(struct bond *,
+                                               const struct eth_addr eth_src,
+                                               uint16_t vlan, void **port_aux);
+bool bond_get_changed_active_slave(const char *name, struct eth_addr *mac,
+                                   bool force);
 
 /* Packet processing. */
 enum bond_verdict {
@@ -89,14 +94,14 @@ 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 dst[ETH_ADDR_LEN]);
+                                           const struct eth_addr dst);
 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);
-bool bond_rebalance(struct bond *);
+void bond_rebalance(struct bond *);
 
 /* Recirculation
  *
@@ -104,9 +109,9 @@ bool bond_rebalance(struct bond *);
  *
  * When recirculation is used, each bond port is assigned with a unique
  * recirc_id. The output action to the bond port will be replaced by
- * a RECIRC action.
+ * a Hash action, followed by a RECIRC action.
  *
- *   ... actions= ... RECIRC(L4_HASH, recirc_id) ....
+ *   ... actions= ... HASH(hash(L4)), RECIRC(recirc_id) ....
  *
  * On handling first output packet, 256 post recirculation flows are installed:
  *
@@ -118,5 +123,4 @@ bool bond_rebalance(struct bond *);
 void bond_update_post_recirc_rules(struct bond *, const bool force);
 bool bond_may_recirc(const struct bond *, uint32_t *recirc_id,
                      uint32_t *hash_bias);
-void bond_recirculation_account(struct bond *);
 #endif /* bond.h */