aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHolger Eitzenberger <holger@eitzenberger.org>2008-12-17 19:13:53 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-17 19:13:53 -0800
commit3b5b35d02264580950d1e1565431b99d97c20ded (patch)
treecdf76ffb873e2ecc5561155b49e29c8b9492325f /drivers
parent3c52065fbbf3bd11776d63d43e18d0fd285b02e2 (diff)
bonding: use port_params in __update_lacpdu_from_port
Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/bonding/bond_3ad.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index dc13450d1e0..b9dd4091ede 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -769,6 +769,7 @@ static struct aggregator *__get_active_agg(struct aggregator *aggregator)
static inline void __update_lacpdu_from_port(struct port *port)
{
struct lacpdu *lacpdu = &port->lacpdu;
+ const struct port_params *partner = &port->partner_oper;
/* update current actual Actor parameters */
/* lacpdu->subtype initialized
@@ -789,12 +790,12 @@ static inline void __update_lacpdu_from_port(struct port *port)
* lacpdu->partner_information_length initialized
*/
- lacpdu->partner_system_priority = htons(port->partner_oper.system_priority);
- lacpdu->partner_system = port->partner_oper.system;
- lacpdu->partner_key = htons(port->partner_oper.key);
- lacpdu->partner_port_priority = htons(port->partner_oper.port_priority);
- lacpdu->partner_port = htons(port->partner_oper.port_number);
- lacpdu->partner_state = port->partner_oper.port_state;
+ lacpdu->partner_system_priority = htons(partner->system_priority);
+ lacpdu->partner_system = partner->system;
+ lacpdu->partner_key = htons(partner->key);
+ lacpdu->partner_port_priority = htons(partner->port_priority);
+ lacpdu->partner_port = htons(partner->port_number);
+ lacpdu->partner_state = partner->port_state;
/* lacpdu->reserved_3_2 initialized
* lacpdu->tlv_type_collector_info initialized