Patchwork [1/9] bonding: improve elaborate port_state assignment

login
register
mail settings
Submitter holger@eitzenberger.org
Date Dec. 17, 2008, 9:28 p.m.
Message ID <20081217213007.374131068@jonathan.eitzenberger.org>
Download mbox | patch
Permalink /patch/14560/
State Accepted
Delegated to: David Miller
Headers show

Comments

holger@eitzenberger.org - Dec. 17, 2008, 9:28 p.m.
The previous code was just a funny way of assigning both values (they
are both of type u8).

Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>

Patch

Index: bonding-2.6/drivers/net/bonding/bond_3ad.c
===================================================================
--- bonding-2.6.orig/drivers/net/bonding/bond_3ad.c
+++ bonding-2.6/drivers/net/bonding/bond_3ad.c
@@ -491,16 +491,7 @@  static void __record_pdu(struct lacpdu *
 		port->partner_oper_system = lacpdu->actor_system;
 		port->partner_oper_system_priority = ntohs(lacpdu->actor_system_priority);
 		port->partner_oper_key = ntohs(lacpdu->actor_key);
-		// zero partener's lase states
-		port->partner_oper_port_state = 0;
-		port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_LACP_ACTIVITY);
-		port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_LACP_TIMEOUT);
-		port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_AGGREGATION);
-		port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_SYNCHRONIZATION);
-		port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_COLLECTING);
-		port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_DISTRIBUTING);
-		port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_DEFAULTED);
-		port->partner_oper_port_state |= (lacpdu->actor_state & AD_STATE_EXPIRED);
+		port->partner_oper_port_state = lacpdu->actor_state;
 
 		// set actor_oper_port_state.defaulted to FALSE
 		port->actor_oper_port_state &= ~AD_STATE_DEFAULTED;