From: Cyrille Pitchen <[email protected]> Date: Fri, 18 Jul 2014 16:21:13 +0200
> From: Nicolas Ferre <[email protected]> > > This addition will also allow to configure DMA burst length. > > Signed-off-by: Nicolas Ferre <[email protected]> > Acked-by: Cyrille Pitchen <[email protected]> > --- > 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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
