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

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

bonding: Fix another case of LACPDU not sent on slave 



When mii-mon discovers that the link is up, it will call
bond_3ad_handle_link_change() but we forget to add the LACP_ENABLED
flag when we discover the speed and duplex for the slave link are
normal.

Change-Id: Ie8b268ecfeea0f99bf9fdcd72706c0653f9d9e49
Signed-off-by: default avatarMahesh Bandewar <maheshb@google.com>
Signed-off-by: default avatarAndy Gospodarek <gospo@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ef015d72

drivers/net/bonding/bond_3ad.c

+3 −0
Original line number Diff line number Diff line
@@ -2415,12 +2415,15 @@ void bond_3ad_handle_link_change(struct slave *slave, char link) 
		port->actor_admin_port_key &= ~AD_SPEED_KEY_MASKS;

		port->actor_oper_port_key = port->actor_admin_port_key |=

			(__get_link_speed(port) << 1);

		if (port->actor_oper_port_key & AD_DUPLEX_KEY_MASKS)

			port->sm_vars |= AD_PORT_LACP_ENABLED;

	} else {

		/* link has failed */

		port->is_enabled = false;

		port->actor_admin_port_key &= ~AD_DUPLEX_KEY_MASKS;

		port->actor_oper_port_key = (port->actor_admin_port_key &=

					     ~AD_SPEED_KEY_MASKS);

		port->sm_vars &= ~AD_PORT_LACP_ENABLED;

	}

	netdev_dbg(slave->bond->dev, "Port %d changed link status to %s\n",

		   port->actor_port_number,