|
@@ -1221,14 +1221,11 @@ static int mtk_tx_alloc(struct mtk_eth *eth)
|
|
if (!ring->buf)
|
|
if (!ring->buf)
|
|
goto no_tx_mem;
|
|
goto no_tx_mem;
|
|
|
|
|
|
- ring->dma = dma_alloc_coherent(eth->dev,
|
|
|
|
- MTK_DMA_SIZE * sz,
|
|
|
|
- &ring->phys,
|
|
|
|
- GFP_ATOMIC | __GFP_ZERO);
|
|
|
|
|
|
+ ring->dma = dma_zalloc_coherent(eth->dev, MTK_DMA_SIZE * sz,
|
|
|
|
+ &ring->phys, GFP_ATOMIC);
|
|
if (!ring->dma)
|
|
if (!ring->dma)
|
|
goto no_tx_mem;
|
|
goto no_tx_mem;
|
|
|
|
|
|
- memset(ring->dma, 0, MTK_DMA_SIZE * sz);
|
|
|
|
for (i = 0; i < MTK_DMA_SIZE; i++) {
|
|
for (i = 0; i < MTK_DMA_SIZE; i++) {
|
|
int next = (i + 1) % MTK_DMA_SIZE;
|
|
int next = (i + 1) % MTK_DMA_SIZE;
|
|
u32 next_ptr = ring->phys + next * sz;
|
|
u32 next_ptr = ring->phys + next * sz;
|