appveyor: Renew SSL link.

[cascardo/ovs.git] / lib / rstp-common.h

diff --git a/lib/rstp-common.h b/lib/rstp-common.h
index cd43079..5b257d0 100644 (file)
--- a/lib/rstp-common.h
+++ b/lib/rstp-common.h
@@ -141,7 +141,7 @@ enum port_role_transition_state_machine {
     PORT_ROLE_TRANSITION_SM_DESIGNATED_DISCARD_EXEC,
     PORT_ROLE_TRANSITION_SM_ALTERNATE_PORT_EXEC,
     PORT_ROLE_TRANSITION_SM_ALTERNATE_PORT,
-    PORT_ROLE_TRANSITION_SM_ALTERNATE_AGREED,
+    PORT_ROLE_TRANSITION_SM_ALTERNATE_AGREED_EXEC,
     PORT_ROLE_TRANSITION_SM_ALTERNATE_PROPOSED_EXEC,
     PORT_ROLE_TRANSITION_SM_BLOCK_PORT_EXEC,
     PORT_ROLE_TRANSITION_SM_BLOCK_PORT,
@@ -705,7 +705,7 @@ struct rstp_port {
 };
 
 struct rstp {
-    struct list node OVS_GUARDED_BY(rstp_mutex);   /* In rstp instances list */
+    struct ovs_list node OVS_GUARDED_BY(rstp_mutex);   /* In rstp instances list */
     char *name;     /* Bridge name. */
 
     /* Changes in last SM execution. */
@@ -866,8 +866,12 @@ struct rstp {
     struct ovs_refcount ref_cnt;
 
     /* Interface to client. */
-    void (*send_bpdu)(struct ofpbuf *bpdu, void *port_aux, void *rstp_aux);
+    void (*send_bpdu)(struct dp_packet *bpdu, void *port_aux, void *rstp_aux);
     void *aux;
+
+    bool root_changed;
+    void *old_root_aux;
+    void *new_root_aux;
 };
 
 #endif /* rstp-common.h */