lkml.org 
[lkml]   [2017]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 159/212] net/mlx4_en: Use __skb_fill_page_desc()
    3.16.44-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Eric Dumazet <edumazet@google.com>

    commit 7f0137e2ef9f32143df623001a96f7aab61a9595 upstream.

    Or we might miss the fact that a page was allocated from memory reserves.

    Fixes: dceeab0e5258 ("mlx4: support __GFP_MEMALLOC for rx")
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/net/ethernet/mellanox/mlx4/en_rx.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
    +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
    @@ -565,10 +565,10 @@ static int mlx4_en_complete_rx_desc(stru
    dma_sync_single_for_cpu(priv->ddev, dma, frag_info->frag_size,
    DMA_FROM_DEVICE);

    - /* Save page reference in skb */
    - __skb_frag_set_page(&skb_frags_rx[nr], frags[nr].page);
    - skb_frag_size_set(&skb_frags_rx[nr], frag_info->frag_size);
    - skb_frags_rx[nr].page_offset = frags[nr].page_offset;
    + __skb_fill_page_desc(skb, nr, frags[nr].page,
    + frags[nr].page_offset,
    + frag_info->frag_size);
    +
    skb->truesize += frag_info->frag_stride;
    frags[nr].page = NULL;
    }
    \
     
     \ /
      Last update: 2017-06-01 18:11    [W:4.849 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site