lkml.org 
[lkml]   [2015]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 07/24] lib/checksum.c: fix build for generic csum_tcpudp_nofold
    3.2.68-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: karl beldan <karl.beldan@gmail.com>

    commit 9ce357795ef208faa0d59894d9d119a7434e37f3 upstream.

    Fixed commit added from64to32 under _#ifndef do_csum_ but used it
    under _#ifndef csum_tcpudp_nofold_, breaking some builds (Fengguang's
    robot reported TILEGX's). Move from64to32 under the latter.

    Fixes: 150ae0e94634 ("lib/checksum.c: fix carry in csum_tcpudp_nofold")
    Reported-by: kbuild test robot <fengguang.wu@intel.com>
    Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
    Cc: Eric Dumazet <edumazet@google.com>
    Cc: David S. Miller <davem@davemloft.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    lib/checksum.c | 18 +++++++++---------
    1 file changed, 9 insertions(+), 9 deletions(-)

    --- a/lib/checksum.c
    +++ b/lib/checksum.c
    @@ -47,15 +47,6 @@ static inline unsigned short from32to16(
    return x;
    }

    -static inline u32 from64to32(u64 x)
    -{
    - /* add up 32-bit and 32-bit for 32+c bit */
    - x = (x & 0xffffffff) + (x >> 32);
    - /* add up carry.. */
    - x = (x & 0xffffffff) + (x >> 32);
    - return (u32)x;
    -}
    -
    static unsigned int do_csum(const unsigned char *buff, int len)
    {
    int odd;
    @@ -188,6 +179,15 @@ csum_partial_copy(const void *src, void
    EXPORT_SYMBOL(csum_partial_copy);

    #ifndef csum_tcpudp_nofold
    +static inline u32 from64to32(u64 x)
    +{
    + /* add up 32-bit and 32-bit for 32+c bit */
    + x = (x & 0xffffffff) + (x >> 32);
    + /* add up carry.. */
    + x = (x & 0xffffffff) + (x >> 32);
    + return (u32)x;
    +}
    +
    __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
    unsigned short len,
    unsigned short proto,


    \
     
     \ /
      Last update: 2015-03-04 00:41    [W:4.951 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site