lkml.org 
[lkml]   [2011]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    SubjectRe: linux-next: build failure after merge of the final tree (net tree related)
    From
    From: Stephen Rothwell <sfr@canb.auug.org.au>
    Date: Fri, 22 Apr 2011 08:10:08 +1000

    > Hi all,
    >
    > After merging the final tree, today's linux-next build (powerpc chrp32_defconfig)
    > failed like this:
    >
    > drivers/net/mv643xx_eth.c: In function 'port_start':
    > drivers/net/mv643xx_eth.c:2250: error: 'dev' undeclared (first use in this function)
    >
    > Caused by commit aad59c431b77 ("net: mv643xx: convert to hw_features").

    I just pushed the following fix, thanks!

    --------------------
    mv643xx_eth: Fix build regression.

    From Stephen Rothwell:

    --------------------
    After merging the final tree, today's linux-next build (powerpc chrp32_defconfig)
    failed like this:

    drivers/net/mv643xx_eth.c: In function 'port_start':
    drivers/net/mv643xx_eth.c:2250: error: 'dev' undeclared (first use in this function)

    Caused by commit aad59c431b77 ("net: mv643xx: convert to hw_features").
    --------------------

    Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    ---
    drivers/net/mv643xx_eth.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
    index 29605a3..57c2ac0 100644
    --- a/drivers/net/mv643xx_eth.c
    +++ b/drivers/net/mv643xx_eth.c
    @@ -2247,7 +2247,7 @@ static void port_start(struct mv643xx_eth_private *mp)
    * frames to RX queue #0, and include the pseudo-header when
    * calculating receive checksums.
    */
    - mv643xx_eth_set_features(dev, dev->features);
    + mv643xx_eth_set_features(mp->dev, mp->dev->features);

    /*
    * Treat BPDUs as normal multicasts, and disable partition mode.
    --
    1.7.4.3


    \
     
     \ /
      Last update: 2011-04-22 00:23    [W:0.022 / U:0.448 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site