From 8c8d6736230b94c90f7d9b09515288e42f5c42cb Mon Sep 17 00:00:00 2001 From: Holger Eitzenberger Date: Wed, 17 Dec 2008 19:13:27 -0800 Subject: [PATCH] --- yaml --- r: 122771 b: refs/heads/master c: 3c52065fbbf3bd11776d63d43e18d0fd285b02e2 h: refs/heads/master i: 122769: 43180311884abd2ebf4482367ed480aae5970491 122767: 6c10917b3c5b62f8be867b93db3e512e87d7ed82 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_3ad.c | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 770c4529cbdf..56ec9d03b3fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce6a49ad401d78ff1f66e2a55cf445d0f45d8146 +refs/heads/master: 3c52065fbbf3bd11776d63d43e18d0fd285b02e2 diff --git a/trunk/drivers/net/bonding/bond_3ad.c b/trunk/drivers/net/bonding/bond_3ad.c index 4792e12a7f2c..dc13450d1e08 100644 --- a/trunk/drivers/net/bonding/bond_3ad.c +++ b/trunk/drivers/net/bonding/bond_3ad.c @@ -543,16 +543,18 @@ static void __update_selected(struct lacpdu *lacpdu, struct port *port) */ static void __update_default_selected(struct port *port) { - // validate the port if (port) { + const struct port_params *admin = &port->partner_admin; + const struct port_params *oper = &port->partner_oper; + // check if any parameter is different - if ((port->partner_admin.port_number != port->partner_oper.port_number) || - (port->partner_admin.port_priority != port->partner_oper.port_priority) || - MAC_ADDRESS_COMPARE(&(port->partner_admin.system), &(port->partner_oper.system)) || - (port->partner_admin.system_priority != port->partner_oper.system_priority) || - (port->partner_admin.key != port->partner_oper.key) || - ((port->partner_admin.port_state & AD_STATE_AGGREGATION) != (port->partner_oper.port_state & AD_STATE_AGGREGATION)) - ) { + if (admin->port_number != oper->port_number + || admin->port_priority != oper->port_priority + || MAC_ADDRESS_COMPARE(&admin->system, &oper->system) + || admin->system_priority != oper->system_priority + || admin->key != oper->key + || (admin->port_state & AD_STATE_AGGREGATION) + != (oper->port_state & AD_STATE_AGGREGATION)) { // update the state machine Selected variable port->sm_vars &= ~AD_PORT_SELECTED; }