From patchwork Wed Dec 17 21:28:28 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: holger@eitzenberger.org X-Patchwork-Id: 14560 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id CDD88DDF7A for ; Thu, 18 Dec 2008 08:30:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751742AbYLQVaT (ORCPT ); Wed, 17 Dec 2008 16:30:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751892AbYLQVaR (ORCPT ); Wed, 17 Dec 2008 16:30:17 -0500 Received: from moutng.kundenserver.de ([212.227.17.10]:57389 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751237AbYLQVaO (ORCPT ); Wed, 17 Dec 2008 16:30:14 -0500 X-Greylist: delayed 4433 seconds by postgrey-1.27 at vger.kernel.org; Wed, 17 Dec 2008 16:30:14 EST Received: from kruemel.eitzenberger.org (p54AD36A6.dip0.t-ipconnect.de [84.173.54.166]) by mrelayeu.kundenserver.de (node=mrelayeu5) with ESMTP (Nemesis) id 0ML25U-1LD3y51exJ-0004Lt; Wed, 17 Dec 2008 22:30:10 +0100 Received: from [192.168.11.10] (helo=jonathan.eitzenberger.org ident=holger) by kruemel.eitzenberger.org with smtp (Exim 4.50) id 1LD3y3-000571-QT; Wed, 17 Dec 2008 22:30:08 +0100 Received: by jonathan.eitzenberger.org (sSMTP sendmail emulation); Wed, 17 Dec 2008 22:30:07 +0100 Message-Id: <20081217213007.374131068@jonathan.eitzenberger.org> References: <20081217212827.080073908@jonathan.eitzenberger.org> User-Agent: quilt/0.46-1 Date: Wed, 17 Dec 2008 22:28:28 +0100 From: Holger Eitzenberger To: Jay Vosburgh Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [patch 1/9] bonding: improve elaborate port_state assignment Content-Disposition: inline; filename=bonding-3ad-improve-partner-assignment.diff X-Provags-ID: V01U2FsdGVkX19TwldF9My/NVilrd4IXHX16itTL1hTlv7+QV0 mutVsomtU27flYWn/3BIUyWng0fmIYmFVSNqtU/WRU65MDIkaT a71irahj8UR1R/jXRiEIuyya+XhbidohBfka1S6FNE= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The previous code was just a funny way of assigning both values (they are both of type u8). Signed-off-by: Holger Eitzenberger 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;