Patchwork [3/9] bonding: use port_params in __record_pdu()

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

Comments

holger@eitzenberger.org - Dec. 17, 2008, 9:28 p.m.
It helps in maintaining the various partner information values from
the LACPDU.  It also removes the pointless comment at the top.

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
@@ -483,24 +483,25 @@  static u16 __ad_timer_to_ticks(u16 timer
  */
 static void __record_pdu(struct lacpdu *lacpdu, struct port *port)
 {
-	// validate lacpdu and port
 	if (lacpdu && port) {
+		struct port_params *partner = &port->partner_oper;
+
 		// record the new parameter values for the partner operational
-		port->partner_oper.port_number = ntohs(lacpdu->actor_port);
-		port->partner_oper.port_priority = ntohs(lacpdu->actor_port_priority);
-		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);
-		port->partner_oper.port_state = lacpdu->actor_state;
+		partner->port_number = ntohs(lacpdu->actor_port);
+		partner->port_priority = ntohs(lacpdu->actor_port_priority);
+		partner->system = lacpdu->actor_system;
+		partner->system_priority = ntohs(lacpdu->actor_system_priority);
+		partner->key = ntohs(lacpdu->actor_key);
+		partner->port_state = lacpdu->actor_state;
 
 		// set actor_oper_port_state.defaulted to FALSE
 		port->actor_oper_port_state &= ~AD_STATE_DEFAULTED;
 
 		// set the partner sync. to on if the partner is sync. and the port is matched
 		if ((port->sm_vars & AD_PORT_MATCHED) && (lacpdu->actor_state & AD_STATE_SYNCHRONIZATION)) {
-			port->partner_oper.port_state |= AD_STATE_SYNCHRONIZATION;
+			partner->port_state |= AD_STATE_SYNCHRONIZATION;
 		} else {
-			port->partner_oper.port_state &= ~AD_STATE_SYNCHRONIZATION;
+			partner->port_state &= ~AD_STATE_SYNCHRONIZATION;
 		}
 	}
 }