From: Holger Eitzenberger <holger@eitzenberger.org>
To: Jay Vosburgh <fubar@us.ibm.com>
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [patch 5/9] bonding: init port_params from template
Date: Wed, 17 Dec 2008 22:28:32 +0100 [thread overview]
Message-ID: <20081217213012.598363663@jonathan.eitzenberger.org> (raw)
In-Reply-To: 20081217212827.080073908@jonathan.eitzenberger.org
[-- Attachment #1: bonding-3ad-init-port_info-from-template.diff --]
[-- Type: text/plain, Size: 1518 bytes --]
Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
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
@@ -1675,6 +1675,14 @@ static void ad_initialize_agg(struct agg
*/
static void ad_initialize_port(struct port *port, int lacp_fast)
{
+ static const struct port_params tmpl = {
+ .system_priority = 0xffff,
+ .key = 1,
+ .port_number = 1,
+ .port_priority = 0xff,
+ .port_state = 1,
+ };
+
if (port) {
port->actor_port_number = 1;
port->actor_port_priority = 0xff;
@@ -1691,18 +1699,9 @@ static void ad_initialize_port(struct po
port->actor_oper_port_state |= AD_STATE_LACP_TIMEOUT;
}
- port->partner_admin.system = null_mac_addr;
- port->partner_oper.system = null_mac_addr;
- port->partner_admin.system_priority = 0xffff;
- port->partner_oper.system_priority = 0xffff;
- port->partner_admin.key = 1;
- port->partner_oper.key = 1;
- port->partner_admin.port_number = 1;
- port->partner_oper.port_number = 1;
- port->partner_admin.port_priority = 0xff;
- port->partner_oper.port_priority = 0xff;
- port->partner_admin.port_state = 1;
- port->partner_oper.port_state = 1;
+ memcpy(&port->partner_admin, &tmpl, sizeof(tmpl));
+ memcpy(&port->partner_oper, &tmpl, sizeof(tmpl));
+
port->is_enabled = 1;
// ****** private parameters ******
port->sm_vars = 0x3;
--
next prev parent reply other threads:[~2008-12-17 21:30 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-17 21:28 [patch 0/9] [RFC] bonding updates for net-next-2.6 Holger Eitzenberger
2008-12-17 21:28 ` [patch 1/9] bonding: improve elaborate port_state assignment Holger Eitzenberger
2008-12-17 21:28 ` [patch 2/9] bonding: introduce and use port_params structure Holger Eitzenberger
2008-12-17 21:28 ` [patch 3/9] bonding: use port_params in __record_pdu() Holger Eitzenberger
2008-12-17 21:28 ` [patch 4/9] bonding: use plain memcpy in __record_default() Holger Eitzenberger
2008-12-17 21:28 ` Holger Eitzenberger [this message]
2008-12-17 21:28 ` [patch 6/9] bonding: remove various function declarations Holger Eitzenberger
2008-12-17 21:28 ` [patch 7/9] bonding: use port_params in __update_selected() Holger Eitzenberger
2008-12-17 21:28 ` [patch 8/9] bonding: use port_params in __update_default_selected() Holger Eitzenberger
2008-12-17 21:28 ` [patch 9/9] bonding: use port_params in __update_lacpdu_from_port Holger Eitzenberger
2008-12-18 3:14 ` [patch 0/9] [RFC] bonding updates for net-next-2.6 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081217213012.598363663@jonathan.eitzenberger.org \
--to=holger@eitzenberger.org \
--cc=davem@davemloft.net \
--cc=fubar@us.ibm.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).