From patchwork Wed Dec 17 21:28:31 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: 14562 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 A94B8DDF38 for ; Thu, 18 Dec 2008 08:30:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752510AbYLQVaa (ORCPT ); Wed, 17 Dec 2008 16:30:30 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752355AbYLQVa3 (ORCPT ); Wed, 17 Dec 2008 16:30:29 -0500 Received: from moutng.kundenserver.de ([212.227.126.186]:63920 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751237AbYLQVaS (ORCPT ); Wed, 17 Dec 2008 16:30:18 -0500 Received: from kruemel.eitzenberger.org (p54AD36A6.dip0.t-ipconnect.de [84.173.54.166]) by mrelayeu.kundenserver.de (node=mrelayeu7) with ESMTP (Nemesis) id 0ML2xA-1LD3y91slR-0003t1; Wed, 17 Dec 2008 22:30:13 +0100 Received: from [192.168.11.10] (helo=jonathan.eitzenberger.org ident=holger) by kruemel.eitzenberger.org with smtp (Exim 4.50) id 1LD3y7-00057A-P2; Wed, 17 Dec 2008 22:30:12 +0100 Received: by jonathan.eitzenberger.org (sSMTP sendmail emulation); Wed, 17 Dec 2008 22:30:11 +0100 Message-Id: <20081217213011.268895930@jonathan.eitzenberger.org> References: <20081217212827.080073908@jonathan.eitzenberger.org> User-Agent: quilt/0.46-1 Date: Wed, 17 Dec 2008 22:28:31 +0100 From: Holger Eitzenberger To: Jay Vosburgh Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [patch 4/9] bonding: use plain memcpy in __record_default() Content-Disposition: inline; filename=bonding-3ad-__record_default-use-partner.dif X-Provags-ID: V01U2FsdGVkX18d84kzyAYHUeguWvxlwmA63f6Hoap2Z1B34JM 6pPl4hJefB5xL9E82KXTQWV2qedmK7UcbKI2+gWx61KkF2h/Il aLZ35+g5vY3BegWBHAPT4YesWp1lM9PDBb8IWyzj9k= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Also remove 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 @@ -516,15 +516,10 @@ static void __record_pdu(struct lacpdu * */ static void __record_default(struct port *port) { - // validate the port if (port) { // record the partner admin parameters - port->partner_oper.port_number = port->partner_admin.port_number; - port->partner_oper.port_priority = port->partner_admin.port_priority; - port->partner_oper.system = port->partner_admin.system; - port->partner_oper.system_priority = port->partner_admin.system_priority; - port->partner_oper.key = port->partner_admin.key; - port->partner_oper.port_state = port->partner_admin.port_state; + memcpy(&port->partner_oper, &port->partner_admin, + sizeof(struct port_params)); // set actor_oper_port_state.defaulted to true port->actor_oper_port_state |= AD_STATE_DEFAULTED;