704-06-v5.19-eth-mtk_eth_soc-remove-a-copy-of-the-NAPI_POLL_WEIGH.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. From 889e3691b9d6573de133da1f5e78f590e52152cd Mon Sep 17 00:00:00 2001
  2. From: Jakub Kicinski <[email protected]>
  3. Date: Thu, 28 Apr 2022 14:23:13 -0700
  4. Subject: [PATCH] eth: mtk_eth_soc: remove a copy of the NAPI_POLL_WEIGHT
  5. define
  6. Defining local versions of NAPI_POLL_WEIGHT with the same
  7. values in the drivers just makes refactoring harder.
  8. Signed-off-by: Jakub Kicinski <[email protected]>
  9. Signed-off-by: David S. Miller <[email protected]>
  10. ---
  11. drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++--
  12. drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 -
  13. 2 files changed, 2 insertions(+), 3 deletions(-)
  14. --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  15. +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  16. @@ -3574,9 +3574,9 @@ static int mtk_probe(struct platform_dev
  17. */
  18. init_dummy_netdev(&eth->dummy_dev);
  19. netif_napi_add(&eth->dummy_dev, &eth->tx_napi, mtk_napi_tx,
  20. - MTK_NAPI_WEIGHT);
  21. + NAPI_POLL_WEIGHT);
  22. netif_napi_add(&eth->dummy_dev, &eth->rx_napi, mtk_napi_rx,
  23. - MTK_NAPI_WEIGHT);
  24. + NAPI_POLL_WEIGHT);
  25. platform_set_drvdata(pdev, eth);
  26. --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
  27. +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
  28. @@ -25,7 +25,6 @@
  29. #define MTK_TX_DMA_BUF_LEN 0x3fff
  30. #define MTK_TX_DMA_BUF_LEN_V2 0xffff
  31. #define MTK_DMA_SIZE 512
  32. -#define MTK_NAPI_WEIGHT 64
  33. #define MTK_MAC_COUNT 2
  34. #define MTK_RX_ETH_HLEN (ETH_HLEN + ETH_FCS_LEN)
  35. #define MTK_RX_HLEN (NET_SKB_PAD + MTK_RX_ETH_HLEN + NET_IP_ALIGN)