From: Koen Vandeputte Date: Fri, 9 Aug 2019 07:51:29 +0000 (+0200) Subject: ar71xx/ath79: ag71xx: init rings with GFP_KERNEL X-Git-Tag: v19.07.0-rc1~354 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c8a6ce71e49c108ca2225345f057777eb046e712;p=oweals%2Fopenwrt.git ar71xx/ath79: ag71xx: init rings with GFP_KERNEL Upstream commit 246902bdf562d45ea3475fac64c93048a7a39f01 Which contains following explanation: -- There is no need to use GFP_ATOMIC here, GFP_KERNEL should be enough. The 'kcalloc()' just a few lines above, already uses GFP_KERNEL. -- Looking at the code, all other descriptors also use plain GFP_KERNEL Signed-off-by: Koen Vandeputte --- diff --git a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c index 40f8aaa20a..b540a56a3a 100644 --- a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c +++ b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c @@ -277,7 +277,7 @@ static int ag71xx_rings_init(struct ag71xx *ag) return -ENOMEM; tx->descs_cpu = dma_alloc_coherent(&ag->pdev->dev, ring_size * AG71XX_DESC_SIZE, - &tx->descs_dma, GFP_ATOMIC); + &tx->descs_dma, GFP_KERNEL); if (!tx->descs_cpu) { kfree(tx->buf); tx->buf = NULL;