ofproto-dpif-xlate: Initialize '*xout' all together at beginning.

[mirror_ovs.git] / ofproto / bond.h

diff --git a/ofproto/bond.h b/ofproto/bond.h
index c783eed6f851c5544f2228af8b321831e1070e52..9082354b5bb27470a80865213b54c1f486c34b6a 100644 (file)
--- a/ofproto/bond.h
+++ b/ofproto/bond.h
@@ -54,7 +54,8 @@ struct bond_settings {
 
     bool lacp_fallback_ab_cfg;  /* Fallback to active-backup on LACP failure. */
 
-    uint8_t active_slave_mac[6];/* The MAC address of the interface
+    uint8_t active_slave_mac[ETH_ADDR_LEN];
+                                /* The MAC address of the interface
                                    that was active during the last
                                    ovs run. */
 };
@@ -80,11 +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 *,
+struct dp_packet *bond_compose_learning_packet(struct bond *,
                                             const uint8_t eth_src[ETH_ADDR_LEN],
                                             uint16_t vlan, void **port_aux);
-bool bond_get_changed_active_slave(const char *name, uint8_t mac[6],
-                                        bool force);
+bool bond_get_changed_active_slave(const char *name, uint8_t mac[ETH_ADDR_LEN],
+                                   bool force);
 
 /* Packet processing. */
 enum bond_verdict {