From: davem@davemloft.net (David Miller)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/6] net/macb: configure for FIFO mode and non-gigabit
Date: Sun, 20 Jul 2014 21:12:32 -0700 (PDT) [thread overview]
Message-ID: <20140720.211232.1172882419541843442.davem@davemloft.net> (raw)
In-Reply-To: <34adf38d52eb31e3ffd36149d320eb0872452bb1.1405689937.git.cyrille.pitchen@atmel.com>
From: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Date: Fri, 18 Jul 2014 16:21:13 +0200
> From: Nicolas Ferre <nicolas.ferre@atmel.com>
>
> This addition will also allow to configure DMA burst length.
>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> Acked-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
> ---
> drivers/net/ethernet/cadence/macb.c | 72 +++++++++++++++++++++++++++----------
> drivers/net/ethernet/cadence/macb.h | 19 ++++++++--
> 2 files changed, 71 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
> index e9daa07..0896d88 100644
> --- a/drivers/net/ethernet/cadence/macb.c
> +++ b/drivers/net/ethernet/cadence/macb.c
> @@ -264,7 +264,8 @@ static void macb_handle_link_change(struct net_device *dev)
> reg |= MACB_BIT(FD);
> if (phydev->speed == SPEED_100)
> reg |= MACB_BIT(SPD);
> - if (phydev->speed == SPEED_1000)
> + if (phydev->speed == SPEED_1000
> + && bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE)
Conditional operators end lines, they do not begin lines.
Also you must start the second and subsequent lines at the very
first column after the openning parenthesis of the first line.
next prev parent reply other threads:[~2014-07-21 4:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-18 14:21 [PATCH 0/6] net/macb: add HW features to macb driver Cyrille Pitchen
2014-07-18 14:21 ` [PATCH 1/6] net/macb: configure for FIFO mode and non-gigabit Cyrille Pitchen
2014-07-21 4:12 ` David Miller [this message]
2014-07-18 14:21 ` [PATCH 2/6] net/macb: add scatter-gather hw feature Cyrille Pitchen
2014-07-21 4:13 ` David Miller
2014-07-23 7:45 ` Cyrille Pitchen
2014-07-18 14:21 ` [PATCH 3/6] net/macb: add TX checksum offload feature Cyrille Pitchen
2014-07-18 14:21 ` [PATCH 4/6] net/macb: add RX " Cyrille Pitchen
2014-07-18 15:36 ` Eric Dumazet
2014-07-22 16:27 ` Cyrille Pitchen
2014-07-22 16:39 ` Florian Fainelli
2014-07-22 22:58 ` Eric Dumazet
2014-07-24 11:59 ` Cyrille Pitchen
2014-07-18 14:32 ` [PATCH 5/6] ARM: at91: change compatibility string for sama5d3x gem Cyrille Pitchen
2014-07-18 14:32 ` [PATCH 6/6] net/macb: enable scatter-gather feature and set DMA burst length for sama5d4 gem Cyrille Pitchen
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=20140720.211232.1172882419541843442.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).