projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rhel: Don't delete bridges on boot.
[openvswitch]
/
lib
/
lacp.h
diff --git
a/lib/lacp.h
b/lib/lacp.h
index 8371feceb7641e42698a55a97993bda998fc781f..0fb797e89b790173012048465b06c800bb2454dc 100644
(file)
--- a/
lib/lacp.h
+++ b/
lib/lacp.h
@@
-33,8
+33,7
@@
#define LACP_FAST_TIME_TX 1000 /* Fast transmission rate. */
#define LACP_SLOW_TIME_TX 30000 /* Slow transmission rate. */
#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_RX_MULTIPLIER 3 /* Multiply by TX rate to get RX rate. */
#define LACP_INFO_LEN 15
struct lacp_info {
#define LACP_INFO_LEN 15
struct lacp_info {
@@
-76,13
+75,20
@@
const struct lacp_pdu *parse_lacp_packet(const struct ofpbuf *);
\f
/* LACP Protocol Implementation. */
\f
/* LACP Protocol Implementation. */
+enum lacp_time {
+ LACP_TIME_FAST,
+ LACP_TIME_SLOW,
+ LACP_TIME_CUSTOM
+};
+
struct lacp_settings {
char *name;
uint8_t id[ETH_ADDR_LEN];
uint16_t priority;
bool active;
struct lacp_settings {
char *name;
uint8_t id[ETH_ADDR_LEN];
uint16_t priority;
bool active;
- bool fast;
- bool strict;
+ enum lacp_time lacp_time;
+ long long int custom_time;
+ bool heartbeat;
};
void lacp_init(void);
};
void lacp_init(void);
@@
-100,6
+106,7
@@
struct lacp_slave_settings {
char *name;
uint16_t id;
uint16_t priority;
char *name;
uint16_t id;
uint16_t priority;
+ uint16_t key;
};
void lacp_slave_register(struct lacp *, void *slave_,
};
void lacp_slave_register(struct lacp *, void *slave_,