Message ID | 9220.1247342635@death.nxdomain.ibm.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Jay Vosburgh <fubar@us.ibm.com> Date: Sat, 11 Jul 2009 13:03:55 -0700 > > From: Julia Lawall <julia@diku.dk> > > AD_SHORT_TIMEOUT and AD_STATE_LACP_ACTIVITY have the same value, but > AD_STATE_LACP_ACTIVITY better reflects the intended semantics. > > [ J adds: AD_STATE_LACP_ACTIVITY is a value defined by the standard, and > should be set here in accordance with 802.3ad 43.4.12; AD_SHORT_TIMEOUT > is a constant specific to the Linux 802.3ad implementation that happens > to have the same value ] > > The semantic match that finds this problem is as follows: > (http://www.emn.fr/x-info/coccinelle/) > > // <smpl> > @@ > struct port_params p; > @@ > * p.port_state |= AD_SHORT_TIMEOUT > // </smpl> > > > Signed-off-by: Julia Lawall <julia@diku.dk> > Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index d4b5708..88a1446 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/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;