diff for duplicates of <20110531004418.GA22937@optiplex.tchesoft.com> diff --git a/a/1.txt b/N1/1.txt index ec401f3..97678f6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,13 +21,13 @@ index c7537abc..c2e0d66 100644 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 || @@ -70,11 +70,11 @@ index c7537abc..c2e0d66 100644 @@ -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 5170279..13d0599 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Rafael Aquini <aquini@linux.com>\0" - "Subject\0[PATCH] bond_3ad.c: switch MAC_ADDRESS_COMPARE macro for\0" - "Date\0Tue, 31 May 2011 00:44:30 +0000\0" + "Subject\0[PATCH] bond_3ad.c: switch MAC_ADDRESS_COMPARE macro for compare_ether_addr()\0" + "Date\0Mon, 30 May 2011 21:44:30 -0300\0" "To\0kernel-janitors@vger.kernel.org\0" "Cc\0Jay Vosburgh <fubar@us.ibm.com>" David Miller <davem@davemloft.net> @@ -31,13 +31,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" @@ -80,11 +80,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" @@ -118,4 +118,4 @@ "-- \n" Rafael Aquini <aquini@linux.com> -bd5b0025fb61ff3ca4de736501474153c3c991526014b35db583fad8e6e319b2 +e326cbee54a57768895481f4776f3e5855fe62f86ced941d70c685ca048e0eeb
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.