]> git.hungrycats.org Git - linux/commitdiff
net/mlx4_en: Use __skb_fill_page_desc()
authorEric Dumazet <edumazet@google.com>
Thu, 23 Feb 2017 10:02:45 +0000 (12:02 +0200)
committerBen Hutchings <ben@decadent.org.uk>
Mon, 5 Jun 2017 20:17:15 +0000 (21:17 +0100)
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

index b07f4c0d617bd144cce6eae6c6784968521b878a..92045adc74fd42a65edc2f44f38b66c1ec20c80e 100644 (file)
@@ -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;
        }