From e842634ec0e14c1b95386de15aabc0e272b9d0b0 Mon Sep 17 00:00:00 2001 From: Holger Eitzenberger Date: Wed, 17 Dec 2008 19:08:14 -0800 Subject: [PATCH] --- yaml --- r: 122766 b: refs/heads/master c: b99d6ba96d814dab06671029948f22995d603d7b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_3ad.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 4e04a1b13a5f..2e8276a60181 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1055c9aba3b6850245fe3bbb533d4747e7f904bf +refs/heads/master: b99d6ba96d814dab06671029948f22995d603d7b diff --git a/trunk/drivers/net/bonding/bond_3ad.c b/trunk/drivers/net/bonding/bond_3ad.c index d02e852afbd9..b789dcb77626 100644 --- a/trunk/drivers/net/bonding/bond_3ad.c +++ b/trunk/drivers/net/bonding/bond_3ad.c @@ -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) { - // 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; } } }