diff for duplicates of <4DE495F8.3030903@bfs.de> diff --git a/a/1.txt b/N1/1.txt index 4efbbe0..7ef6327 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,13 +32,13 @@ Am 31.05.2011 02:44, schrieb Rafael Aquini: > static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL * HZ) / 1000; > @@ -469,7 +466,7 @@ static void __choose_matched(struct lacpdu *lacpdu, struct port *port) > // check if all parameters are alike -> if (((ntohs(lacpdu->partner_port) = port->actor_port_number) && -> (ntohs(lacpdu->partner_port_priority) = port->actor_port_priority) && +> if (((ntohs(lacpdu->partner_port) == port->actor_port_number) && +> (ntohs(lacpdu->partner_port_priority) == port->actor_port_priority) && > - !MAC_ADDRESS_COMPARE(&(lacpdu->partner_system), &(port->actor_system)) && > + !compare_ether_addr((const u8 *)&(lacpdu->partner_system), (const u8 *)&(port->actor_system)) && -> (ntohs(lacpdu->partner_system_priority) = port->actor_system_priority) && -> (ntohs(lacpdu->partner_key) = port->actor_oper_port_key) && -> ((lacpdu->partner_state & AD_STATE_AGGREGATION) = (port->actor_oper_port_state & AD_STATE_AGGREGATION))) || +> (ntohs(lacpdu->partner_system_priority) == port->actor_system_priority) && +> (ntohs(lacpdu->partner_key) == port->actor_oper_port_key) && +> ((lacpdu->partner_state & AD_STATE_AGGREGATION) == (port->actor_oper_port_state & AD_STATE_AGGREGATION))) || > @@ -559,7 +556,8 @@ static void __update_selected(struct lacpdu *lacpdu, struct port *port) > // check if any parameter is different > if (ntohs(lacpdu->actor_port) != partner->port_number || @@ -81,11 +81,11 @@ Am 31.05.2011 02:44, schrieb Rafael Aquini: > @@ -1331,11 +1331,11 @@ static void ad_port_selection_logic(struct port *port) > } > // check if current aggregator suits us -> if (((aggregator->actor_oper_aggregator_key = port->actor_oper_port_key) && // if all parameters match AND +> if (((aggregator->actor_oper_aggregator_key == port->actor_oper_port_key) && // if all parameters match AND > - !MAC_ADDRESS_COMPARE(&(aggregator->partner_system), &(port->partner_oper.system)) && > + !compare_ether_addr((const u8 *)&(aggregator->partner_system), (const u8 *)&(port->partner_oper.system)) && -> (aggregator->partner_system_priority = port->partner_oper.system_priority) && -> (aggregator->partner_oper_aggregator_key = port->partner_oper.key) +> (aggregator->partner_system_priority == port->partner_oper.system_priority) && +> (aggregator->partner_oper_aggregator_key == port->partner_oper.key) > ) && > - ((MAC_ADDRESS_COMPARE(&(port->partner_oper.system), &(null_mac_addr)) && // partner answers > + ((compare_ether_addr((const u8 *)&(port->partner_oper.system), (const u8 *)&(null_mac_addr)) && // partner answers diff --git a/a/content_digest b/N1/content_digest index 229d65e..a4c3dca 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020110531004418.GA22937@optiplex.tchesoft.com\0" "From\0walter harms <wharms@bfs.de>\0" "Subject\0Re: [PATCH] bond_3ad.c: switch MAC_ADDRESS_COMPARE macro for compare_ether_addr()\0" - "Date\0Tue, 31 May 2011 07:17:12 +0000\0" + "Date\0Tue, 31 May 2011 09:17:12 +0200\0" "To\0aquini@linux.com\0" "Cc\0kernel-janitors@vger.kernel.org" Jay Vosburgh <fubar@us.ibm.com> @@ -44,13 +44,13 @@ "> static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL * HZ) / 1000;\n" "> @@ -469,7 +466,7 @@ static void __choose_matched(struct lacpdu *lacpdu, struct port *port)\n" "> \t// check if all parameters are alike\n" - "> \tif (((ntohs(lacpdu->partner_port) = port->actor_port_number) &&\n" - "> \t (ntohs(lacpdu->partner_port_priority) = port->actor_port_priority) &&\n" + "> \tif (((ntohs(lacpdu->partner_port) == port->actor_port_number) &&\n" + "> \t (ntohs(lacpdu->partner_port_priority) == port->actor_port_priority) &&\n" "> -\t !MAC_ADDRESS_COMPARE(&(lacpdu->partner_system), &(port->actor_system)) &&\n" "> +\t !compare_ether_addr((const u8 *)&(lacpdu->partner_system), (const u8 *)&(port->actor_system)) &&\n" - "> \t (ntohs(lacpdu->partner_system_priority) = port->actor_system_priority) &&\n" - "> \t (ntohs(lacpdu->partner_key) = port->actor_oper_port_key) &&\n" - "> \t ((lacpdu->partner_state & AD_STATE_AGGREGATION) = (port->actor_oper_port_state & AD_STATE_AGGREGATION))) ||\n" + "> \t (ntohs(lacpdu->partner_system_priority) == port->actor_system_priority) &&\n" + "> \t (ntohs(lacpdu->partner_key) == port->actor_oper_port_key) &&\n" + "> \t ((lacpdu->partner_state & AD_STATE_AGGREGATION) == (port->actor_oper_port_state & AD_STATE_AGGREGATION))) ||\n" "> @@ -559,7 +556,8 @@ static void __update_selected(struct lacpdu *lacpdu, struct port *port)\n" "> \t\t// check if any parameter is different\n" "> \t\tif (ntohs(lacpdu->actor_port) != partner->port_number ||\n" @@ -93,11 +93,11 @@ "> @@ -1331,11 +1331,11 @@ static void ad_port_selection_logic(struct port *port)\n" "> \t\t}\n" "> \t\t// check if current aggregator suits us\n" - "> \t\tif (((aggregator->actor_oper_aggregator_key = port->actor_oper_port_key) && // if all parameters match AND\n" + "> \t\tif (((aggregator->actor_oper_aggregator_key == port->actor_oper_port_key) && // if all parameters match AND\n" "> -\t\t !MAC_ADDRESS_COMPARE(&(aggregator->partner_system), &(port->partner_oper.system)) &&\n" "> +\t\t !compare_ether_addr((const u8 *)&(aggregator->partner_system), (const u8 *)&(port->partner_oper.system)) &&\n" - "> \t\t (aggregator->partner_system_priority = port->partner_oper.system_priority) &&\n" - "> \t\t (aggregator->partner_oper_aggregator_key = port->partner_oper.key)\n" + "> \t\t (aggregator->partner_system_priority == port->partner_oper.system_priority) &&\n" + "> \t\t (aggregator->partner_oper_aggregator_key == port->partner_oper.key)\n" "> \t\t ) &&\n" "> -\t\t ((MAC_ADDRESS_COMPARE(&(port->partner_oper.system), &(null_mac_addr)) && // partner answers\n" "> +\t\t ((compare_ether_addr((const u8 *)&(port->partner_oper.system), (const u8 *)&(null_mac_addr)) && // partner answers\n" @@ -125,4 +125,4 @@ "> \n" "> \t\taggregator_identifier = 0;" -79c12782ae71c23a72735a5cb9570e17a60e04fa234a13a3fe84fbfbcb9166b5 +7d2461223aafe8457309c731ca49ec2430700be449530818cfd7f639946bf525
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.