Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 122770
b: refs/heads/master
c: ce6a49a
h: refs/heads/master
v: v3
  • Loading branch information
Holger Eitzenberger authored and David S. Miller committed Dec 18, 2008
1 parent 4318031 commit a231fa1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a6ae186b9a950f4d0467cb9c3661965f442176de
refs/heads/master: ce6a49ad401d78ff1f66e2a55cf445d0f45d8146
16 changes: 8 additions & 8 deletions trunk/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 a231fa1

Please sign in to comment.