diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/bonding/bond_3ad.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index 6f3655d3934f..7a108fa24a6d 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c | |||
| @@ -491,16 +491,7 @@ static void __record_pdu(struct lacpdu *lacpdu, struct port *port) | |||
| 491 | port->partner_oper_system = lacpdu->actor_system; | 491 | port->partner_oper_system = lacpdu->actor_system; |
| 492 | port->partner_oper_system_priority = ntohs(lacpdu->actor_system_priority); | 492 | port->partner_oper_system_priority = ntohs(lacpdu->actor_system_priority); |
| 493 | port->partner_oper_key = ntohs(lacpdu->actor_key); | 493 | port->partner_oper_key = ntohs(lacpdu->actor_key); |
| 494 | // zero partener's lase states | 494 | port->partner_oper_port_state = lacpdu->actor_state; |
| 495 | port->partner_oper_port_state = 0; | ||
| 496 | port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_LACP_ACTIVITY); | ||
| 497 | port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_LACP_TIMEOUT); | ||
| 498 | port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_AGGREGATION); | ||
| 499 | port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_SYNCHRONIZATION); | ||
| 500 | port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_COLLECTING); | ||
| 501 | port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_DISTRIBUTING); | ||
| 502 | port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_DEFAULTED); | ||
| 503 | port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_EXPIRED); | ||
| 504 | 495 | ||
| 505 | // set actor_oper_port_state.defaulted to FALSE | 496 | // set actor_oper_port_state.defaulted to FALSE |
| 506 | port->actor_oper_port_state &= ~AD_STATE_DEFAULTED; | 497 | port->actor_oper_port_state &= ~AD_STATE_DEFAULTED; |