aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorHolger Eitzenberger <holger@eitzenberger.org>2008-12-17 22:13:53 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-17 22:13:53 -0500
commit3b5b35d02264580950d1e1565431b99d97c20ded (patch)
treecdf76ffb873e2ecc5561155b49e29c8b9492325f /drivers/net/bonding
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/net/bonding')
-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 dc13450d1e08..b9dd4091ede9 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)
769static inline void __update_lacpdu_from_port(struct port *port) 769static inline void __update_lacpdu_from_port(struct port *port)
770{ 770{
771 struct lacpdu *lacpdu = &port->lacpdu; 771 struct lacpdu *lacpdu = &port->lacpdu;
772 const struct port_params *partner = &port->partner_oper;
772 773
773 /* update current actual Actor parameters */ 774 /* update current actual Actor parameters */
774 /* lacpdu->subtype initialized 775 /* lacpdu->subtype initialized
@@ -789,12 +790,12 @@ static inline void __update_lacpdu_from_port(struct port *port)
789 * lacpdu->partner_information_length initialized 790 * lacpdu->partner_information_length initialized
790 */ 791 */
791 792
792 lacpdu->partner_system_priority = htons(port->partner_oper.system_priority); 793 lacpdu->partner_system_priority = htons(partner->system_priority);
793 lacpdu->partner_system = port->partner_oper.system; 794 lacpdu->partner_system = partner->system;
794 lacpdu->partner_key = htons(port->partner_oper.key); 795 lacpdu->partner_key = htons(partner->key);
795 lacpdu->partner_port_priority = htons(port->partner_oper.port_priority); 796 lacpdu->partner_port_priority = htons(partner->port_priority);
796 lacpdu->partner_port = htons(port->partner_oper.port_number); 797 lacpdu->partner_port = htons(partner->port_number);
797 lacpdu->partner_state = port->partner_oper.port_state; 798 lacpdu->partner_state = partner->port_state;
798 799
799 /* lacpdu->reserved_3_2 initialized 800 /* lacpdu->reserved_3_2 initialized
800 * lacpdu->tlv_type_collector_info initialized 801 * lacpdu->tlv_type_collector_info initialized