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

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

bonding: deprecate BOND_MONITOR_CHURNED in favor of existing definitions 



AD_PORT_ACTOR_CHURN and AD_PORT_PARTNER_CHURN are already present and
essentially BOND_MONITOR_CHURNED is a combination of these two definitions.

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 ec9a82fb

drivers/net/bonding/bond_3ad.c

+6 −6
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#define AD_STANDBY                 0x2

#define AD_MAX_TX_IN_SECOND        3

#define AD_COLLECTOR_MAX_DELAY     0

#define AD_MONITOR_CHURNED         0x1000



/* Timer definitions (43.4.4 in the 802.3ad standard) */

#define AD_FAST_PERIODIC_TIME      1
@@ -71,6 +70,7 @@ 
#define AD_PORT_STANDBY         0x80

#define AD_PORT_SELECTED        0x100

#define AD_PORT_MOVED           0x200

#define AD_PORT_CHURNED         (AD_PORT_ACTOR_CHURN | AD_PORT_PARTNER_CHURN)



/* Port Key definitions

 * key is determined according to the link speed, duplex and
@@ -1016,7 +1016,7 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port) 
	/* first, check if port was reinitialized */

	if (port->sm_vars & AD_PORT_BEGIN) {

		port->sm_rx_state = AD_RX_INITIALIZE;

		port->sm_vars |= AD_MONITOR_CHURNED;

		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))
@@ -1026,7 +1026,7 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port) 
		 (port->sm_rx_state == AD_RX_DEFAULTED) ||

		 (port->sm_rx_state == AD_RX_CURRENT))) {

		if (port->sm_rx_state != AD_RX_CURRENT)

			port->sm_vars |= AD_MONITOR_CHURNED;

			port->sm_vars |= AD_PORT_CHURNED;

		port->sm_rx_timer_counter = 0;

		port->sm_rx_state = AD_RX_CURRENT;

	} else {
@@ -1108,7 +1108,7 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port) 
			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;

			port->sm_vars |= AD_MONITOR_CHURNED;

			port->sm_vars |= AD_PORT_CHURNED;

			break;

		case AD_RX_DEFAULTED:

			__update_default_selected(port);
@@ -1144,8 +1144,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port) 
 */

static void ad_churn_machine(struct port *port)

{

	if (port->sm_vars & AD_MONITOR_CHURNED) {

		port->sm_vars &= ~AD_MONITOR_CHURNED;

	if (port->sm_vars & AD_PORT_CHURNED) {

		port->sm_vars &= ~AD_PORT_CHURNED;

		port->sm_churn_actor_state = AD_CHURN_MONITOR;

		port->sm_churn_partner_state = AD_CHURN_MONITOR;

		port->sm_churn_actor_timer_counter =