From 61d3616704a93417ffe3891a55c323c6cc55e06e Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 11 Jul 2009 10:03:55 +0000 Subject: [PATCH] --- yaml --- r: 158971 b: refs/heads/master c: 8e321c4f72e2fb580a091317ba0fb2941f637ce1 h: refs/heads/master i: 158969: 70252d6c5d0e1eb46879366ab465fa18b7429f96 158967: 47f0c318becdcc9c8dd858713faf7bcfa8cd6edb v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_3ad.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b76f8576e524..66a6ac4da387 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 440c1ce178d6a6743e02d136a55b2de3f6d62a20 +refs/heads/master: 8e321c4f72e2fb580a091317ba0fb2941f637ce1 diff --git a/trunk/drivers/net/bonding/bond_3ad.c b/trunk/drivers/net/bonding/bond_3ad.c index 0e7dfe0981d9..be799d2a8a8d 100644 --- a/trunk/drivers/net/bonding/bond_3ad.c +++ b/trunk/drivers/net/bonding/bond_3ad.c @@ -1109,7 +1109,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port) //mux machine in case of EXPIRED even if LINK_DOWN didn't arrive for the port. port->partner_oper.port_state &= ~AD_STATE_SYNCHRONIZATION; port->sm_vars &= ~AD_PORT_MATCHED; - port->partner_oper.port_state |= AD_SHORT_TIMEOUT; + port->partner_oper.port_state |= + AD_STATE_LACP_ACTIVITY; port->sm_rx_timer_counter = __ad_timer_to_ticks(AD_CURRENT_WHILE_TIMER, (u16)(AD_SHORT_TIMEOUT)); port->actor_oper_port_state |= AD_STATE_EXPIRED; break;