Theoretically, when LACP is configured, a bond shouldn't receive
any packets on disabled slaves. This patch enforces that
invariant.
---
lib/bond.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/bond.c b/lib/bond.c
index d8e0966..a48d9c9 100644
--- a/lib/bond.c
+++ b/lib/bond.c
@@ -559,10 +559,12 @@ enum bond_verdict
bond_check_admissibility(struct bond *bond, const void *slave_,
const uint8_t eth_dst[ETH_ADDR_LEN], tag_type *tags)
{
+ struct bond_slave *slave = bond_slave_lookup(bond, slave_);
+
/* Admit all packets if LACP has been negotiated, because that means that
* the remote switch is aware of the bond and will "do the right thing". */
if (bond->lacp_negotiated) {
- return BV_ACCEPT;
+ return slave->enabled ? BV_ACCEPT : BV_DROP;
}
/* Drop all multicast packets on inactive slaves. */
@@ -576,8 +578,6 @@ bond_check_admissibility(struct bond *bond, const void
*slave_,
/* Drop all packets which arrive on backup slaves. This is similar to how
* Linux bonding handles active-backup bonds. */
if (bond->balance == BM_AB) {
- struct bond_slave *slave = bond_slave_lookup(bond, slave_);
-
*tags |= bond_get_active_slave_tag(bond);
if (bond->active_slave != slave) {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
--
1.7.5.2
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
