diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2017-07-04 21:47:19 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2017-07-04 21:47:19 +0530 |
| commit | 01c829496f253e0b9ac1b9ff683bfd5ef8b5a90d (patch) | |
| tree | fc8700231efa93f68eb3edf214904dfb9b359d05 /drivers/net/ethernet/freescale/gianfar.c | |
| parent | f5ec4ffd9c9ddf29aaf339a8619a5cd145f62342 (diff) | |
| parent | 80cbc8caf930654244b6719a0b2faf4e2c09c797 (diff) | |
Merge remote-tracking branch 'stable-rc/linux-4.4.y' into 4.4.76-rc-hikey4.4-76-rc-hikey-20170704
Diffstat (limited to 'drivers/net/ethernet/freescale/gianfar.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 3e233d924cce..4cd2a7d0124f 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -1999,8 +1999,8 @@ static void free_skb_rx_queue(struct gfar_priv_rx_q *rx_queue) if (!rxb->page) continue; - dma_unmap_single(rx_queue->dev, rxb->dma, - PAGE_SIZE, DMA_FROM_DEVICE); + dma_unmap_page(rx_queue->dev, rxb->dma, + PAGE_SIZE, DMA_FROM_DEVICE); __free_page(rxb->page); rxb->page = NULL; @@ -2939,7 +2939,7 @@ static bool gfar_add_rx_frag(struct gfar_rx_buff *rxb, u32 lstatus, size, GFAR_RXB_TRUESIZE); /* try reuse page */ - if (unlikely(page_count(page) != 1)) + if (unlikely(page_count(page) != 1 || page_is_pfmemalloc(page))) return false; /* change offset to the other half */ |