lkml.org 
[lkml]   [2017]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 109/199] gro: use min_t() in skb_gro_reset_offset()
    3.2.87-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Eric Dumazet <edumazet@google.com>

    commit 7cfd5fd5a9813f1430290d20c0fead9b4582a307 upstream.

    On 32bit arches, (skb->end - skb->data) is not 'unsigned int',
    so we shall use min_t() instead of min() to avoid a compiler error.

    Fixes: 1272ce87fa01 ("gro: Enter slow-path if there is no tailroom")
    Reported-by: kernel test robot <fengguang.wu@intel.com>
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    [bwh: Backported to 3.2: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    net/core/dev.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/net/core/dev.c
    +++ b/net/core/dev.c
    @@ -3627,8 +3627,9 @@ void skb_gro_reset_offset(struct sk_buff
    !PageHighMem(skb_frag_page(&skb_shinfo(skb)->frags[0]))) {
    NAPI_GRO_CB(skb)->frag0 =
    skb_frag_address(&skb_shinfo(skb)->frags[0]);
    - NAPI_GRO_CB(skb)->frag0_len = min(skb_frag_size(&skb_shinfo(skb)->frags[0]),
    - skb->end - skb->tail);
    + NAPI_GRO_CB(skb)->frag0_len = min_t(unsigned int,
    + skb_frag_size(&skb_shinfo(skb)->frags[0]),
    + skb->end - skb->tail);
    }
    }
    EXPORT_SYMBOL(skb_gro_reset_offset);
    \
     
     \ /
      Last update: 2017-03-10 12:56    [W:4.146 / U:0.668 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site