Commit c7e703d0 authored by Holger Eitzenberger's avatar Holger Eitzenberger Committed by David S. Miller

bonding: init port_params from template

Signed-off-by: default avatarHolger Eitzenberger <holger@eitzenberger.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5eefd1ad
...@@ -1675,6 +1675,14 @@ static void ad_initialize_agg(struct aggregator *aggregator) ...@@ -1675,6 +1675,14 @@ static void ad_initialize_agg(struct aggregator *aggregator)
*/ */
static void ad_initialize_port(struct port *port, int lacp_fast) 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) { if (port) {
port->actor_port_number = 1; port->actor_port_number = 1;
port->actor_port_priority = 0xff; port->actor_port_priority = 0xff;
...@@ -1691,18 +1699,9 @@ static void ad_initialize_port(struct port *port, int lacp_fast) ...@@ -1691,18 +1699,9 @@ static void ad_initialize_port(struct port *port, int lacp_fast)
port->actor_oper_port_state |= AD_STATE_LACP_TIMEOUT; port->actor_oper_port_state |= AD_STATE_LACP_TIMEOUT;
} }
port->partner_admin.system = null_mac_addr; memcpy(&port->partner_admin, &tmpl, sizeof(tmpl));
port->partner_oper.system = null_mac_addr; memcpy(&port->partner_oper, &tmpl, sizeof(tmpl));
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;
port->is_enabled = 1; port->is_enabled = 1;
// ****** private parameters ****** // ****** private parameters ******
port->sm_vars = 0x3; port->sm_vars = 0x3;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment