diff options
author | Ethan Jackson <ethan@nicira.com> | 2011-04-26 15:05:19 -0700 |
---|---|---|
committer | Ethan Jackson <ethan@nicira.com> | 2011-04-26 17:51:09 -0700 |
commit | da2f7b8ff5f41470cd1238376fbad5a4b75ad1a0 (patch) | |
tree | 54e79505837aeb9a701f23b547bf1098cdafbae9 /lib/lacp.c | |
parent | d4f15cb982ff772110509c4292697bbe8a68d0f4 (diff) |
lacp: New other_config setting "lacp-force-aggregatable".
In some extremely advanced situations, one may want to force
non-bondable slaves to advertise themselves as bondable. This
patch adds that capability.
Also includes some minor code cleanup.
Diffstat (limited to 'lib/lacp.c')
-rw-r--r-- | lib/lacp.c | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -53,6 +53,7 @@ struct lacp { bool strict; /* True if in strict mode. */ bool negotiated; /* True if LACP negotiations were successful. */ bool update; /* True if lacp_update() needs to be called. */ + bool force_agg; /* Forces LACP_STATE_AGG bit on all slaves. */ }; struct slave { @@ -190,6 +191,7 @@ lacp_configure(struct lacp *lacp, const struct lacp_settings *s) lacp->active = s->active; lacp->lacp_time = s->lacp_time; + lacp->force_agg = s->force_agg; lacp->custom_time = MAX(TIME_UPDATE_INTERVAL, s->custom_time); } @@ -525,13 +527,14 @@ slave_set_expired(struct slave *slave) static void slave_get_actor(struct slave *slave, struct lacp_info *actor) { + struct lacp *lacp = slave->lacp; uint8_t state = 0; - if (slave->lacp->active) { + if (lacp->active) { state |= LACP_STATE_ACT; } - if (slave->lacp->lacp_time != LACP_TIME_SLOW) { + if (lacp->lacp_time != LACP_TIME_SLOW) { state |= LACP_STATE_TIME; } @@ -547,20 +550,20 @@ slave_get_actor(struct slave *slave, struct lacp_info *actor) state |= LACP_STATE_EXP; } - if (hmap_count(&slave->lacp->slaves) > 1) { + if (lacp->force_agg || hmap_count(&lacp->slaves) > 1) { state |= LACP_STATE_AGG; } - if (slave->attached || !slave->lacp->negotiated) { + if (slave->attached || !lacp->negotiated) { state |= LACP_STATE_COL | LACP_STATE_DIST; } actor->state = state; - actor->key = htons(slave->lacp->key_slave->port_id); + actor->key = htons(lacp->key_slave->port_id); actor->port_priority = htons(slave->port_priority); actor->port_id = htons(slave->port_id); - actor->sys_priority = htons(slave->lacp->sys_priority); - memcpy(&actor->sys_id, slave->lacp->sys_id, ETH_ADDR_LEN); + actor->sys_priority = htons(lacp->sys_priority); + memcpy(&actor->sys_id, lacp->sys_id, ETH_ADDR_LEN); } /* Given 'slave', populates 'priority' with data representing its LACP link |