aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_3ad.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/bonding/bond_3ad.c')
-rw-r--r--drivers/net/bonding/bond_3ad.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 88c3fe80b355..d69e6838f21e 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -561,12 +561,12 @@ static void __update_selected(struct lacpdu *lacpdu, struct port *port)
561 const struct port_params *partner = &port->partner_oper; 561 const struct port_params *partner = &port->partner_oper;
562 562
563 // check if any parameter is different 563 // check if any parameter is different
564 if (ntohs(lacpdu->actor_port) != partner->port_number 564 if (ntohs(lacpdu->actor_port) != partner->port_number ||
565 || ntohs(lacpdu->actor_port_priority) != partner->port_priority 565 ntohs(lacpdu->actor_port_priority) != partner->port_priority ||
566 || MAC_ADDRESS_COMPARE(&lacpdu->actor_system, &partner->system) 566 MAC_ADDRESS_COMPARE(&lacpdu->actor_system, &partner->system) ||
567 || ntohs(lacpdu->actor_system_priority) != partner->system_priority 567 ntohs(lacpdu->actor_system_priority) != partner->system_priority ||
568 || ntohs(lacpdu->actor_key) != partner->key 568 ntohs(lacpdu->actor_key) != partner->key ||
569 || (lacpdu->actor_state & AD_STATE_AGGREGATION) != (partner->port_state & AD_STATE_AGGREGATION)) { 569 (lacpdu->actor_state & AD_STATE_AGGREGATION) != (partner->port_state & AD_STATE_AGGREGATION)) {
570 // update the state machine Selected variable 570 // update the state machine Selected variable
571 port->sm_vars &= ~AD_PORT_SELECTED; 571 port->sm_vars &= ~AD_PORT_SELECTED;
572 } 572 }
@@ -592,12 +592,12 @@ static void __update_default_selected(struct port *port)
592 const struct port_params *oper = &port->partner_oper; 592 const struct port_params *oper = &port->partner_oper;
593 593
594 // check if any parameter is different 594 // check if any parameter is different
595 if (admin->port_number != oper->port_number 595 if (admin->port_number != oper->port_number ||
596 || admin->port_priority != oper->port_priority 596 admin->port_priority != oper->port_priority ||
597 || MAC_ADDRESS_COMPARE(&admin->system, &oper->system) 597 MAC_ADDRESS_COMPARE(&admin->system, &oper->system) ||
598 || admin->system_priority != oper->system_priority 598 admin->system_priority != oper->system_priority ||
599 || admin->key != oper->key 599 admin->key != oper->key ||
600 || (admin->port_state & AD_STATE_AGGREGATION) 600 (admin->port_state & AD_STATE_AGGREGATION)
601 != (oper->port_state & AD_STATE_AGGREGATION)) { 601 != (oper->port_state & AD_STATE_AGGREGATION)) {
602 // update the state machine Selected variable 602 // update the state machine Selected variable
603 port->sm_vars &= ~AD_PORT_SELECTED; 603 port->sm_vars &= ~AD_PORT_SELECTED;