752-08-v6.7-net-ethernet-mtk_wed-rename-mtk_rxbm_desc-in-mtk_wed.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. From: Lorenzo Bianconi <[email protected]>
  2. Date: Mon, 18 Sep 2023 12:29:07 +0200
  3. Subject: [PATCH] net: ethernet: mtk_wed: rename mtk_rxbm_desc in
  4. mtk_wed_bm_desc
  5. Rename mtk_rxbm_desc structure in mtk_wed_bm_desc since it will be used
  6. even on tx side by MT7988 SoC.
  7. Signed-off-by: Lorenzo Bianconi <[email protected]>
  8. Signed-off-by: Paolo Abeni <[email protected]>
  9. ---
  10. --- a/drivers/net/ethernet/mediatek/mtk_wed.c
  11. +++ b/drivers/net/ethernet/mediatek/mtk_wed.c
  12. @@ -422,7 +422,7 @@ free_pagelist:
  13. static int
  14. mtk_wed_rx_buffer_alloc(struct mtk_wed_device *dev)
  15. {
  16. - struct mtk_rxbm_desc *desc;
  17. + struct mtk_wed_bm_desc *desc;
  18. dma_addr_t desc_phys;
  19. dev->rx_buf_ring.size = dev->wlan.rx_nbuf;
  20. @@ -442,7 +442,7 @@ mtk_wed_rx_buffer_alloc(struct mtk_wed_d
  21. static void
  22. mtk_wed_free_rx_buffer(struct mtk_wed_device *dev)
  23. {
  24. - struct mtk_rxbm_desc *desc = dev->rx_buf_ring.desc;
  25. + struct mtk_wed_bm_desc *desc = dev->rx_buf_ring.desc;
  26. if (!desc)
  27. return;
  28. --- a/include/linux/soc/mediatek/mtk_wed.h
  29. +++ b/include/linux/soc/mediatek/mtk_wed.h
  30. @@ -45,7 +45,7 @@ enum mtk_wed_wo_cmd {
  31. MTK_WED_WO_CMD_WED_END
  32. };
  33. -struct mtk_rxbm_desc {
  34. +struct mtk_wed_bm_desc {
  35. __le32 buf0;
  36. __le32 token;
  37. } __packed __aligned(4);
  38. @@ -104,7 +104,7 @@ struct mtk_wed_device {
  39. struct {
  40. int size;
  41. - struct mtk_rxbm_desc *desc;
  42. + struct mtk_wed_bm_desc *desc;
  43. dma_addr_t desc_phys;
  44. } rx_buf_ring;