leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bonding: use port_params in __record_pdu()

Browse Source 
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Holger Eitzenberger 2008-12-17 19:08:14 -08:00 committed by David S. Miller
parent 1055c9aba3
commit b99d6ba96d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/bonding/bond_3ad.c
View File

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