From 6c10917b3c5b62f8be867b93db3e512e87d7ed82 Mon Sep 17 00:00:00 2001 From: Holger Eitzenberger Date: Wed, 17 Dec 2008 19:08:46 -0800 Subject: [PATCH] --- yaml --- r: 122767 b: refs/heads/master c: 5eefd1adceb49cada224a383f4a36c2f27fe4968 h: refs/heads/master i: 122765: 46694a1dc1107a995232f3cda9082267daf5f83e 122763: bb574904ef8eb2603ef64236580b2db49cba2431 122759: 634bb432276f24159c1c3b6434fdf4d531a0fb81 122751: 6daa3d51d7075525f05f5211545e144444ae1142 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_3ad.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 2e8276a60181..5ab670f21553 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b99d6ba96d814dab06671029948f22995d603d7b +refs/heads/master: 5eefd1adceb49cada224a383f4a36c2f27fe4968 diff --git a/trunk/drivers/net/bonding/bond_3ad.c b/trunk/drivers/net/bonding/bond_3ad.c index b789dcb77626..0674d4149808 100644 --- a/trunk/drivers/net/bonding/bond_3ad.c +++ b/trunk/drivers/net/bonding/bond_3ad.c @@ -516,15 +516,10 @@ static void __record_pdu(struct lacpdu *lacpdu, struct port *port) */ 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;