Use ovs_be32 in nx_flow_mod_table_id

[openvswitch] / lib / lacp.h

diff --git a/lib/lacp.h b/lib/lacp.h
index 27dc174ed83f45c81b07864d4e526ed7485d5219..293fc454d2f0d7ca1f9ae857ccf361949927b86a 100644 (file)
--- a/lib/lacp.h
+++ b/lib/lacp.h
@@ -24,19 +24,25 @@
 /* LACP Protocol Implementation. */
 
 enum lacp_time {
-    LACP_TIME_FAST,
-    LACP_TIME_SLOW,
-    LACP_TIME_CUSTOM
+    LACP_TIME_FAST,                   /* LACP fast mode. */
+    LACP_TIME_SLOW,                   /* LACP slow mode. */
+    LACP_TIME_CUSTOM                  /* Nonstandard custom mode. */
+};
+
+enum lacp_status {
+    LACP_NEGOTIATED,                  /* Successful LACP negotations. */
+    LACP_CONFIGURED,                  /* LACP is enabled but not negotiated. */
+    LACP_DISABLED                     /* LACP is not enabled. */
 };
 
 struct lacp_settings {
-    char *name;
-    uint8_t id[ETH_ADDR_LEN];
-    uint16_t priority;
-    bool active;
-    enum lacp_time lacp_time;
-    long long int custom_time;
-    bool heartbeat;
+    char *name;                       /* Name (for debugging). */
+    uint8_t id[ETH_ADDR_LEN];         /* System ID. Must be nonzero. */
+    uint16_t priority;                /* System priority. */
+    bool active;                      /* Active or passive mode? */
+    enum lacp_time lacp_time;         /* Probe rate. */
+    long long int custom_time;        /* Probe interval if LACP_TIME_CUSTOM. */
+    bool heartbeat;                   /* Heartbeat mode. */
 };
 
 void lacp_init(void);
@@ -48,13 +54,13 @@ bool lacp_is_active(const struct lacp *);
 
 void lacp_process_packet(struct lacp *, const void *slave,
                          const struct ofpbuf *packet);
-bool lacp_negotiated(const struct lacp *);
+enum lacp_status lacp_status(const struct lacp *);
 
 struct lacp_slave_settings {
-    char *name;
-    uint16_t id;
-    uint16_t priority;
-    uint16_t key;
+    char *name;                       /* Name (for debugging). */
+    uint16_t id;                      /* Port ID. */
+    uint16_t priority;                /* Port priority. */
+    uint16_t key;                     /* Aggregation key. */
 };
 
 void lacp_slave_register(struct lacp *, void *slave_,