From 6cbaf96065c43797a1b929f79c45aaacc00006a4 Mon Sep 17 00:00:00 2001 From: Holger Eitzenberger Date: Wed, 17 Dec 2008 19:07:16 -0800 Subject: [PATCH] --- yaml --- r: 122764 b: refs/heads/master c: aa3128199dbe07b5be3382de590c59216f91d3e3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_3ad.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 44f06cc168db..65920d3ae79e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42199884594bc336c9185441cbed99a9324dab34 +refs/heads/master: aa3128199dbe07b5be3382de590c59216f91d3e3 diff --git a/trunk/drivers/net/bonding/bond_3ad.c b/trunk/drivers/net/bonding/bond_3ad.c index 6f3655d3934f..7a108fa24a6d 100644 --- a/trunk/drivers/net/bonding/bond_3ad.c +++ b/trunk/drivers/net/bonding/bond_3ad.c @@ -491,16 +491,7 @@ static void __record_pdu(struct lacpdu *lacpdu, struct port *port) 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;