From patchwork Wed Dec 17 21:28:30 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: 14565 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 7B3E3DDF20 for ; Thu, 18 Dec 2008 08:31:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752154AbYLQVaZ (ORCPT ); Wed, 17 Dec 2008 16:30:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751979AbYLQVaW (ORCPT ); Wed, 17 Dec 2008 16:30:22 -0500 Received: from moutng.kundenserver.de ([212.227.17.10]:51798 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751762AbYLQVaQ (ORCPT ); Wed, 17 Dec 2008 16:30:16 -0500 Received: from kruemel.eitzenberger.org (p54AD36A6.dip0.t-ipconnect.de [84.173.54.166]) by mrelayeu.kundenserver.de (node=mrelayeu3) with ESMTP (Nemesis) id 0MKxQS-1LD3y824en-0002EP; Wed, 17 Dec 2008 22:30:12 +0100 Received: from [192.168.11.10] (helo=jonathan.eitzenberger.org ident=holger) by kruemel.eitzenberger.org with smtp (Exim 4.50) id 1LD3y6-000577-Au; Wed, 17 Dec 2008 22:30:11 +0100 Received: by jonathan.eitzenberger.org (sSMTP sendmail emulation); Wed, 17 Dec 2008 22:30:09 +0100 Message-Id: <20081217213009.859308351@jonathan.eitzenberger.org> References: <20081217212827.080073908@jonathan.eitzenberger.org> User-Agent: quilt/0.46-1 Date: Wed, 17 Dec 2008 22:28:30 +0100 From: Holger Eitzenberger To: Jay Vosburgh Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [patch 3/9] bonding: use port_params in __record_pdu() Content-Disposition: inline; filename=bonding-3ad-__record_pdu-use-partner.diff X-Provags-ID: V01U2FsdGVkX1/IBOHXGR/N8+SJPrLFGfWJELtfq1Ryzoia7Yi dfh4DRYQvQ5JEtBBrdy4Q6Q2j5fCetzQTXc8WpafpNlY+oefJR Ouwzpc6T6N6gmExirsb8BWUoV1t8jsekNgerBSWVE0= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 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; } } }