lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bonding: use port_params in __update_selected()

Browse Source 
Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Holger Eitzenberger
2008-12-17 19:13:07 -08:00
committed by David S. Miller
parent a6ae186b9a
commit ce6a49ad40
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/bonding/bond_3ad.c
View File

@@ -513,16 +513,16 @@ static void __record_default(struct port *port)
*/ */
static void __update_selected(struct lacpdu *lacpdu, struct port *port) static void __update_selected(struct lacpdu *lacpdu, struct port *port)
{ {
// validate lacpdu and port
if (lacpdu && port) { if (lacpdu && port) {
const struct port_params *partner = &port->partner_oper;
// check if any parameter is different // check if any parameter is different
if ((ntohs(lacpdu->actor_port) != port->partner_oper.port_number) || if (ntohs(lacpdu->actor_port) != partner->port_number
(ntohs(lacpdu->actor_port_priority) != port->partner_oper.port_priority) || || ntohs(lacpdu->actor_port_priority) != partner->port_priority
MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->partner_oper.system)) || || MAC_ADDRESS_COMPARE(&lacpdu->actor_system, &partner->system)
(ntohs(lacpdu->actor_system_priority) != port->partner_oper.system_priority) || || ntohs(lacpdu->actor_system_priority) != partner->system_priority
(ntohs(lacpdu->actor_key) != port->partner_oper.key) || || ntohs(lacpdu->actor_key) != partner->key
((lacpdu->actor_state & AD_STATE_AGGREGATION) != (port->partner_oper.port_state & AD_STATE_AGGREGATION)) || (lacpdu->actor_state & AD_STATE_AGGREGATION) != (partner->port_state & AD_STATE_AGGREGATION)) {
) {
// update the state machine Selected variable // update the state machine Selected variable
port->sm_vars &= ~AD_PORT_SELECTED; port->sm_vars &= ~AD_PORT_SELECTED;
} }