diff options
author | Holger Eitzenberger <holger@eitzenberger.org> | 2008-12-17 22:08:46 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-17 22:08:46 -0500 |
commit | 5eefd1adceb49cada224a383f4a36c2f27fe4968 (patch) | |
tree | bd91802c30ca29865860a9aa9c3760728d1a59a3 /drivers/net | |
parent | b99d6ba96d814dab06671029948f22995d603d7b (diff) |
bonding: use plain memcpy in __record_default()
Also remove the pointless comment at the top.
Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/bonding/bond_3ad.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index b789dcb77626..0674d4149808 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c | |||
@@ -516,15 +516,10 @@ static void __record_pdu(struct lacpdu *lacpdu, struct port *port) | |||
516 | */ | 516 | */ |
517 | static void __record_default(struct port *port) | 517 | static void __record_default(struct port *port) |
518 | { | 518 | { |
519 | // validate the port | ||
520 | if (port) { | 519 | if (port) { |
521 | // record the partner admin parameters | 520 | // record the partner admin parameters |
522 | port->partner_oper.port_number = port->partner_admin.port_number; | 521 | memcpy(&port->partner_oper, &port->partner_admin, |
523 | port->partner_oper.port_priority = port->partner_admin.port_priority; | 522 | sizeof(struct port_params)); |
524 | port->partner_oper.system = port->partner_admin.system; | ||
525 | port->partner_oper.system_priority = port->partner_admin.system_priority; | ||
526 | port->partner_oper.key = port->partner_admin.key; | ||
527 | port->partner_oper.port_state = port->partner_admin.port_state; | ||
528 | 523 | ||
529 | // set actor_oper_port_state.defaulted to true | 524 | // set actor_oper_port_state.defaulted to true |
530 | port->actor_oper_port_state |= AD_STATE_DEFAULTED; | 525 | port->actor_oper_port_state |= AD_STATE_DEFAULTED; |