X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fpackets.h;h=c858fc091ea39b83ef494b72ac4c7760da468bc7;hb=bbb1951c485766b82b365b7f25ec917867b2ecf4;hp=0bc368b939f617d73844c5920618214984df938c;hpb=c25c91fd5ed075a6e9f37ab38c3ea2302e9e8442;p=openvswitch

diff --git a/lib/packets.h b/lib/packets.h
index 0bc368b9..c858fc09 100644
--- a/lib/packets.h
+++ b/lib/packets.h
@@ -429,12 +429,12 @@ bool ipv6_is_cidr(const struct in6_addr *netmask);
 
 #define LACP_INFO_LEN 15
 struct lacp_info {
-    ovs_be16 sys_priority;       /* System priority. */
-    uint8_t sysid[ETH_ADDR_LEN]; /* System ID. */
-    ovs_be16 key;                /* Operational key. */
-    ovs_be16 port_priority;      /* Port priority. */
-    ovs_be16 portid;             /* Port ID. */
-    uint8_t state;               /* State mask.  See LACP_STATE macros. */
+    ovs_be16 sys_priority;            /* System priority. */
+    uint8_t sys_id[ETH_ADDR_LEN];     /* System ID. */
+    ovs_be16 key;                     /* Operational key. */
+    ovs_be16 port_priority;           /* Port priority. */
+    ovs_be16 port_id;                 /* Port ID. */
+    uint8_t state;                    /* State mask.  See LACP_STATE macros. */
 } __attribute__((packed));
 BUILD_ASSERT_DECL(LACP_INFO_LEN == sizeof(struct lacp_info));
 
@@ -460,9 +460,11 @@ struct lacp_pdu {
 } __attribute__((packed));
 BUILD_ASSERT_DECL(LACP_PDU_LEN == sizeof(struct lacp_pdu));
 
-void compose_lacp_packet(struct ofpbuf *, struct lacp_info *actor,
-                         struct lacp_info *partner,
-                         const uint8_t eth_src[ETH_ADDR_LEN]);
+void compose_lacp_packet(struct ofpbuf *, const uint8_t eth_src[ETH_ADDR_LEN],
+                         const struct lacp_pdu *);
+
+void compose_lacp_pdu(const struct lacp_info *actor,
+                      const struct lacp_info *partner, struct lacp_pdu *);
 
 const struct lacp_pdu *parse_lacp_packet(const struct ofpbuf *);