[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <54BD6E28.8020705@cumulusnetworks.com>
Date: Mon, 19 Jan 2015 15:50:48 -0500
From: Jonathan Toppins <jtoppins@...ulusnetworks.com>
To: Nikolay Aleksandrov <nikolay@...hat.com>, netdev@...r.kernel.org
CC: Andy Gospodarek <gospo@...ulusnetworks.com>,
Wilson Kok <wkok@...ulusnetworks.com>
Subject: Re: [PATCH net-next 3/5] bonding: fix incorrect lacp mux state when
agg not active
On 1/19/15 2:26 PM, Nikolay Aleksandrov wrote:
>> diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
>> index e9b706f..52a8772 100644
>> --- a/drivers/net/bonding/bond_3ad.c
>> +++ b/drivers/net/bonding/bond_3ad.c
>> @@ -471,10 +471,13 @@ static void __record_pdu(struct lacpdu *lacpdu, struct port *port)
>> * and the port is matched
>> */
>> if ((port->sm_vars & AD_PORT_MATCHED)
>> - && (lacpdu->actor_state & AD_STATE_SYNCHRONIZATION))
>> + && (lacpdu->actor_state & AD_STATE_SYNCHRONIZATION)) {
> In net/ it's preferred to have the logical operators at the end of the
> previous line. It'd be nice if we start fixing these in bond_3ad.c since
> they're being touched by the patch anyhow.
Ack, I prefer at the end too. Question, would it be acceptable to do the
cleanup of the entire bond_3ad.c code in a separate patch? That way the
fix vs. cleanup is clear.
>> case AD_MUX_COLLECTING_DISTRIBUTING:
>> if (!(port->sm_vars & AD_PORT_SELECTED) ||
>> (port->sm_vars & AD_PORT_STANDBY) ||
>> - !(port->partner_oper.port_state & AD_STATE_SYNCHRONIZATION)) {
>> + !(port->partner_oper.port_state &
>> + AD_STATE_SYNCHRONIZATION) ||
>> + !(port->actor_oper_port_state &
>> + AD_STATE_SYNCHRONIZATION)) {
> IMO this one looks a bit confusing when broken up like that.
Ack, it seems in this case making checkpatch.pl happy should be secondary.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists