ramips: ethernet: use own page_frag_cache

[openwrt/staging/lynxis.git] / target / linux / ramips / files-4.14 / drivers / net / ethernet / mediatek / mtk_eth_soc.c

diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 8dcc17774b50f68afd4ba92ac07d270dccc5d6d0..8bf17f629c2fa5f29f37eed0315a59c62f6046cf 100644 (file)
--- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -219,8 +219,9 @@ static inline void fe_set_txd(struct fe_tx_dma *txd, struct fe_tx_dma *dma_txd)
 
 static void fe_clean_rx(struct fe_priv *priv)
 {
-       int i;
        struct fe_rx_ring *ring = &priv->rx_ring;
+       struct page *page;
+       int i;
 
        if (ring->rx_data) {
                for (i = 0; i < ring->rx_ring_size; i++)
@@ -244,6 +245,13 @@ static void fe_clean_rx(struct fe_priv *priv)
                                  ring->rx_phys);
                ring->rx_dma = NULL;
        }
+
+       if (!ring->frag_cache.va)
+           return;
+
+       page = virt_to_page(ring->frag_cache.va);
+       __page_frag_cache_drain(page, ring->frag_cache.pagecnt_bias);
+       memset(&ring->frag_cache, 0, sizeof(ring->frag_cache));
 }
 
 static int fe_alloc_rx(struct fe_priv *priv)
@@ -258,7 +266,9 @@ static int fe_alloc_rx(struct fe_priv *priv)
                goto no_rx_mem;
 
        for (i = 0; i < ring->rx_ring_size; i++) {
-               ring->rx_data[i] = netdev_alloc_frag(ring->frag_size);
+               ring->rx_data[i] = page_frag_alloc(&ring->frag_cache,
+                                                  ring->frag_size,
+                                                  GFP_KERNEL);
                if (!ring->rx_data[i])
                        goto no_rx_mem;
        }
@@ -881,7 +891,8 @@ static int fe_poll_rx(struct napi_struct *napi, int budget,
                        break;
 
                /* alloc new buffer */
-               new_data = netdev_alloc_frag(ring->frag_size);
+               new_data = page_frag_alloc(&ring->frag_cache, ring->frag_size,
+                                          GFP_ATOMIC);
                if (unlikely(!new_data)) {
                        stats->rx_dropped++;
                        goto release_desc;