diff options
| author | John Crispin <john@phrozen.org> | 2016-06-10 13:27:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-10 23:29:28 -0700 |
| commit | 605e4fe476956c67ced8518247e6c9601a31b868 (patch) | |
| tree | eb1cdfbeed055e2e2b44512c0cd1019ad2911205 /drivers/net/ethernet/mediatek/mtk_eth_soc.h | |
| parent | 562c5a70400c75f50d99de631666ac7cc2f03958 (diff) | |
| download | linux-stable-605e4fe476956c67ced8518247e6c9601a31b868.tar.gz linux-stable-605e4fe476956c67ced8518247e6c9601a31b868.tar.bz2 linux-stable-605e4fe476956c67ced8518247e6c9601a31b868.zip | |
net: mediatek: fix missing free of scratch memory
Scratch memory gets allocated in mtk_init_fq_dma() but the corresponding
code to free it is missing inside mtk_dma_free() causing a memory leak.
With this patch applied, we can run ifconfig up/down several thousand
times without any problems.
Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mediatek/mtk_eth_soc.h')
| -rw-r--r-- | drivers/net/ethernet/mediatek/mtk_eth_soc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h index eed626d56ea4..57f7e8a3dbe2 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -357,6 +357,7 @@ struct mtk_rx_ring { * @rx_ring: Pointer to the memore holding info about the RX ring * @rx_napi: The NAPI struct * @scratch_ring: Newer SoCs need memory for a second HW managed TX ring + * @phy_scratch_ring: physical address of scratch_ring * @scratch_head: The scratch memory that scratch_ring points to. * @clk_ethif: The ethif clock * @clk_esw: The switch clock @@ -384,6 +385,7 @@ struct mtk_eth { struct mtk_rx_ring rx_ring; struct napi_struct rx_napi; struct mtk_tx_dma *scratch_ring; + dma_addr_t phy_scratch_ring; void *scratch_head; struct clk *clk_ethif; struct clk *clk_esw; |