niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

bonding: remove "port-moved" state that was never implemented

Browse source 
LACP state-machine defines "port-moved" state when the same ActorSystemID
and Port are seen in a LACPDU received on different port. The state is
never set since it's not implemented. However the state-machine attempts
to clear that state occasionally. LACP state machine is already complicated
and since this state is not implemented, removing it's checks makes the
state-machine little simpler.

Signed-off-by: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Mahesh Bandewar 2017-03-08 10:55:59 -08:00 • committed by David S. Miller
parent 8b426dc54c
commit ec891c8b8d
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/bonding/bond_3ad.c
View file

@ -1052,8 +1052,7 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
port->sm_rx_state = AD_RX_INITIALIZE; port->sm_rx_state = AD_RX_INITIALIZE;
port->sm_vars |= AD_PORT_CHURNED; port->sm_vars |= AD_PORT_CHURNED;
/* check if port is not enabled */ /* check if port is not enabled */
} else if (!(port->sm_vars & AD_PORT_BEGIN) } else if (!(port->sm_vars & AD_PORT_BEGIN) && !port->is_enabled)
&& !port->is_enabled && !(port->sm_vars & AD_PORT_MOVED))
port->sm_rx_state = AD_RX_PORT_DISABLED; port->sm_rx_state = AD_RX_PORT_DISABLED;
/* check if new lacpdu arrived */ /* check if new lacpdu arrived */
else if (lacpdu && ((port->sm_rx_state == AD_RX_EXPIRED) || else if (lacpdu && ((port->sm_rx_state == AD_RX_EXPIRED) ||
@ -1081,11 +1080,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
/* if no lacpdu arrived and no timer is on */ /* if no lacpdu arrived and no timer is on */
switch (port->sm_rx_state) { switch (port->sm_rx_state) {
case AD_RX_PORT_DISABLED: case AD_RX_PORT_DISABLED:
if (port->sm_vars & AD_PORT_MOVED) if (port->is_enabled &&
port->sm_rx_state = AD_RX_INITIALIZE; (port->sm_vars & AD_PORT_LACP_ENABLED))
else if (port->is_enabled
&& (port->sm_vars
& AD_PORT_LACP_ENABLED))
port->sm_rx_state = AD_RX_EXPIRED; port->sm_rx_state = AD_RX_EXPIRED;
else if (port->is_enabled else if (port->is_enabled
&& ((port->sm_vars && ((port->sm_vars
@ -1115,7 +1111,6 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
port->sm_vars &= ~AD_PORT_SELECTED; port->sm_vars &= ~AD_PORT_SELECTED;
__record_default(port); __record_default(port);
port->actor_oper_port_state &= ~AD_STATE_EXPIRED; port->actor_oper_port_state &= ~AD_STATE_EXPIRED;
port->sm_vars &= ~AD_PORT_MOVED;
port->sm_rx_state = AD_RX_PORT_DISABLED; port->sm_rx_state = AD_RX_PORT_DISABLED;
/* Fall Through */ /* Fall Through */