From: Jonathan Toppins <jtoppins@cumulusnetworks•com>
To: Nikolay Aleksandrov <nikolay@redhat•com>, netdev@vger•kernel.org
Cc: Andy Gospodarek <gospo@cumulusnetworks•com>,
Wilson Kok <wkok@cumulusnetworks•com>
Subject: Re: [PATCH net-next 3/5] bonding: fix incorrect lacp mux state when agg not active
Date: Mon, 19 Jan 2015 15:50:48 -0500 [thread overview]
Message-ID: <54BD6E28.8020705@cumulusnetworks.com> (raw)
In-Reply-To: <54BD5A53.8050609@redhat.com>
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.
next prev parent reply other threads:[~2015-01-19 20:50 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-16 15:57 [PATCH net-next 0/5] bonding: various 802.3ad fixes Jonathan Toppins
2015-01-16 15:57 ` [PATCH net-next 1/5] bonding: keep bond interface carrier off until at least one active member Jonathan Toppins
2015-01-19 19:27 ` Nikolay Aleksandrov
2015-01-19 20:54 ` Jonathan Toppins
2015-01-19 21:16 ` Jay Vosburgh
2015-01-21 5:22 ` Jonathan Toppins
2015-01-21 7:14 ` Jay Vosburgh
2015-01-23 23:04 ` Jonathan Toppins
2015-01-24 3:15 ` Jay Vosburgh
[not found] ` <CAE4R7bBzeO5MvL5zS5Piq6Ld2ZbD8smGx8XaJy5SvY7kHbX_Kw@mail.gmail.com>
2015-01-21 5:27 ` Jonathan Toppins
2015-01-16 15:57 ` [PATCH net-next 2/5] bonding: fix bond_open() don't always set slave active flag Jonathan Toppins
2015-01-16 15:57 ` [PATCH net-next 3/5] bonding: fix incorrect lacp mux state when agg not active Jonathan Toppins
2015-01-19 19:26 ` Nikolay Aleksandrov
2015-01-19 20:50 ` Jonathan Toppins [this message]
2015-01-19 20:56 ` David Miller
2015-01-16 15:57 ` [PATCH net-next 4/5] bonding: fix LACP PDU not sent on slave port sometimes Jonathan Toppins
2015-01-16 15:57 ` [PATCH net-next 5/5] bonding: cleanup and remove dead code Jonathan Toppins
2015-01-19 19:29 ` [PATCH net-next 0/5] bonding: various 802.3ad fixes Nikolay Aleksandrov
2015-01-19 20:39 ` Jonathan Toppins
2015-01-19 20:19 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54BD6E28.8020705@cumulusnetworks.com \
--to=jtoppins@cumulusnetworks$(echo .)com \
--cc=gospo@cumulusnetworks$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nikolay@redhat$(echo .)com \
--cc=wkok@cumulusnetworks$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox