Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec891c8b authored by Mahesh Bandewar's avatar Mahesh Bandewar Committed by David S. Miller
Browse files

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



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: default avatarMahesh Bandewar <maheshb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b426dc5

drivers/net/bonding/bond_3ad.c

+3 −8
Original line number Diff line number Diff line
@@ -1052,8 +1052,7 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port) 
		port->sm_rx_state = AD_RX_INITIALIZE;

		port->sm_vars |= AD_PORT_CHURNED;

	/* check if port is not enabled */

	} else if (!(port->sm_vars & AD_PORT_BEGIN)

		 && !port->is_enabled && !(port->sm_vars & AD_PORT_MOVED))

	} else if (!(port->sm_vars & AD_PORT_BEGIN) && !port->is_enabled)

		port->sm_rx_state = AD_RX_PORT_DISABLED;

	/* check if new lacpdu arrived */

	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 */

			switch (port->sm_rx_state) {

			case AD_RX_PORT_DISABLED:

				if (port->sm_vars & AD_PORT_MOVED)

					port->sm_rx_state = AD_RX_INITIALIZE;

				else if (port->is_enabled

					 && (port->sm_vars

					     & AD_PORT_LACP_ENABLED))

				if (port->is_enabled &&

				    (port->sm_vars & AD_PORT_LACP_ENABLED))

					port->sm_rx_state = AD_RX_EXPIRED;

				else if (port->is_enabled

					 && ((port->sm_vars
@@ -1115,7 +1111,6 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port) 
			port->sm_vars &= ~AD_PORT_SELECTED;

			__record_default(port);

			port->actor_oper_port_state &= ~AD_STATE_EXPIRED;

			port->sm_vars &= ~AD_PORT_MOVED;

			port->sm_rx_state = AD_RX_PORT_DISABLED;



			/* Fall Through */