X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Flacp.h;h=624e3682dc9df81a637630c7da0ee7577bf4e3a6;hb=a39c3ff9f586d3416976d3c3bd095fa81d73efa0;hp=2992bcfd78cc72fb0179ebaf10761e6e1888575b;hpb=44cb163fa64e1ae22522f16fe1011bbe8b6e9ea9;p=sliver-openvswitch.git

diff --git a/lib/lacp.h b/lib/lacp.h
index 2992bcfd7..624e3682d 100644
--- a/lib/lacp.h
+++ b/lib/lacp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Nicira Networks.
+ * Copyright (c) 2011 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,20 @@
 #include <stdint.h>
 #include "packets.h"
 
+/* LACP Protocol Implementation. */
+
+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;
-    bool fast;
+    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? */
+    bool fast;                        /* Fast or slow probe interval. */
 };
 
 void lacp_init(void);
@@ -36,14 +44,15 @@ void lacp_destroy(struct lacp *);
 void lacp_configure(struct lacp *, const struct lacp_settings *);
 bool lacp_is_active(const struct lacp *);
 
-void lacp_process_pdu(struct lacp *, const void *slave,
-                      const struct lacp_pdu *);
-bool lacp_negotiated(const struct lacp *);
+void lacp_process_packet(struct lacp *, const void *slave,
+                         const struct ofpbuf *packet);
+enum lacp_status lacp_status(const struct lacp *);
 
 struct lacp_slave_settings {
-    char *name;
-    uint16_t id;
-    uint16_t priority;
+    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_,
@@ -55,7 +64,7 @@ uint16_t lacp_slave_get_port_id(const struct lacp *, const void *slave);
 bool lacp_slave_is_current(const struct lacp *, const void *slave_);
 
 /* Callback function for lacp_run() for sending a LACP PDU. */
-typedef void lacp_send_pdu(void *slave, const struct lacp_pdu *);
+typedef void lacp_send_pdu(void *slave, const void *pdu, size_t pdu_size);
 
 void lacp_run(struct lacp *, lacp_send_pdu *);
 void lacp_wait(struct lacp *);