Skip to content

Commit

Permalink
bonding: use port_params in __update_selected()
Browse files Browse the repository at this point in the history
Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Holger Eitzenberger authored and David S. Miller committed Dec 18, 2008
1 parent a6ae186 commit ce6a49a
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/net/bonding/bond_3ad.c
Original file line number Diff line number Diff line change
Expand Up @@ -513,16 +513,16 @@ static void __record_default(struct port *port)
*/
static void __update_selected(struct lacpdu *lacpdu, struct port *port)
{
// validate lacpdu and port
if (lacpdu && port) {
const struct port_params *partner = &port->partner_oper;

// check if any parameter is different
if ((ntohs(lacpdu->actor_port) != port->partner_oper.port_number) ||
(ntohs(lacpdu->actor_port_priority) != port->partner_oper.port_priority) ||
MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->partner_oper.system)) ||
(ntohs(lacpdu->actor_system_priority) != port->partner_oper.system_priority) ||
(ntohs(lacpdu->actor_key) != port->partner_oper.key) ||
((lacpdu->actor_state & AD_STATE_AGGREGATION) != (port->partner_oper.port_state & AD_STATE_AGGREGATION))
) {
if (ntohs(lacpdu->actor_port) != partner->port_number
|| ntohs(lacpdu->actor_port_priority) != partner->port_priority
|| MAC_ADDRESS_COMPARE(&lacpdu->actor_system, &partner->system)
|| ntohs(lacpdu->actor_system_priority) != partner->system_priority
|| ntohs(lacpdu->actor_key) != partner->key
|| (lacpdu->actor_state & AD_STATE_AGGREGATION) != (partner->port_state & AD_STATE_AGGREGATION)) {
// update the state machine Selected variable
port->sm_vars &= ~AD_PORT_SELECTED;
}
Expand Down

0 comments on commit ce6a49a

Please sign in to comment.