From: Holger Eitzenberger Date: Thu, 18 Dec 2008 03:13:53 +0000 (-0800) Subject: bonding: use port_params in __update_lacpdu_from_port X-Git-Tag: v2.6.29-rc1~581^2~123 X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=3b5b35d02264580950d1e1565431b99d97c20ded;p=cascardo%2Flinux.git bonding: use port_params in __update_lacpdu_from_port Signed-off-by: Holger Eitzenberger Signed-off-by: David S. Miller --- 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) 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