diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-02-23 12:02:45 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-06-05 21:17:15 +0100 |
| commit | 0ae2dd2595a30324f9fb9a678bb1e8b45c70c8a5 (patch) | |
| tree | d6c5f9dfaea4e453d51649c1530cdc5bda720a64 /drivers | |
| parent | 361c34a1e5121395e88a9e7550500b7b42e6cf47 (diff) | |
| download | linux-stable-0ae2dd2595a30324f9fb9a678bb1e8b45c70c8a5.tar.gz linux-stable-0ae2dd2595a30324f9fb9a678bb1e8b45c70c8a5.tar.bz2 linux-stable-0ae2dd2595a30324f9fb9a678bb1e8b45c70c8a5.zip | |
net/mlx4_en: Use __skb_fill_page_desc()
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_rx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index b07f4c0d617b..92045adc74fd 100644 --- 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(struct mlx4_en_priv *priv, 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; } |