lacp: Move LACP packet data to lacp header file.

1 files changed, 0 insertions, 53 deletions

diff --git a/lib/packets.h b/lib/packets.h
index 251fc1cb..f45c3312 100644
--- a/lib/packets.h
+++ b/lib/packets.h
@@ -403,57 +403,4 @@ void *snap_compose(struct ofpbuf *, const uint8_t eth_dst[ETH_ADDR_LEN],
                    const uint8_t eth_src[ETH_ADDR_LEN],
                    unsigned int oui, uint16_t snap_type, size_t size);
 
-/* Masks for lacp_info state member. */
-#define LACP_STATE_ACT  0x01 /* Activity. Active or passive? */
-#define LACP_STATE_TIME 0x02 /* Timeout. Short or long timeout? */
-#define LACP_STATE_AGG  0x04 /* Aggregation. Is the link is bondable? */
-#define LACP_STATE_SYNC 0x08 /* Synchronization. Is the link in up to date? */
-#define LACP_STATE_COL  0x10 /* Collecting. Is the link receiving frames? */
-#define LACP_STATE_DIST 0x20 /* Distributing. Is the link sending frames? */
-#define LACP_STATE_DEF  0x40 /* Defaulted. Using default partner info? */
-#define LACP_STATE_EXP  0x80 /* Expired. Using expired partner info? */
-
-#define LACP_FAST_TIME_TX 1000  /* Fast transmission rate. */
-#define LACP_SLOW_TIME_TX 30000 /* Slow transmission rate. */
-#define LACP_FAST_TIME_RX (LACP_FAST_TIME_TX * 3) /* Fast receive rate. */
-#define LACP_SLOW_TIME_RX (LACP_SLOW_TIME_TX * 3) /* Slow receive rate. */
-
-#define LACP_INFO_LEN 15
-struct lacp_info {
-    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));
-
-#define LACP_PDU_LEN 110
-struct lacp_pdu {
-    uint8_t subtype;          /* Always 1. */
-    uint8_t version;          /* Always 1. */
-
-    uint8_t actor_type;       /* Always 1. */
-    uint8_t actor_len;        /* Always 20. */
-    struct lacp_info actor;   /* LACP actor information. */
-    uint8_t z1[3];            /* Reserved.  Always 0. */
-
-    uint8_t partner_type;     /* Always 2. */
-    uint8_t partner_len;      /* Always 20. */
-    struct lacp_info partner; /* LACP partner information. */
-    uint8_t z2[3];            /* Reserved.  Always 0. */
-
-    uint8_t collector_type;   /* Always 3. */
-    uint8_t collector_len;    /* Always 16. */
-    ovs_be16 collector_delay; /* Maximum collector delay. Set to UINT16_MAX. */
-    uint8_t z3[64];           /* Combination of several fields.  Always 0. */
-} __attribute__((packed));
-BUILD_ASSERT_DECL(LACP_PDU_LEN == sizeof(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 *);
-
 #endif /* packets.h */