From: Koen Vandeputte Date: Fri, 9 Aug 2019 16:51:07 +0000 (+0200) Subject: ar71xx: ag71xx: init rings with GFP_KERNEL X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2a08bf36565f94b2a329668b1c04a2b52e067477;p=openwrt%2Fstaging%2Fdedeckeh.git ar71xx: ag71xx: init rings with GFP_KERNEL ar71xx got lost during final rebase .. Fixes: b417a0c48d63 ("ar71xx/ath79: ag71xx: init rings with GFP_KERNEL") Signed-off-by: Koen Vandeputte --- diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c index 30ab37efe4..f0d8d46a18 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c @@ -291,7 +291,7 @@ static int ag71xx_rings_init(struct ag71xx *ag) return -ENOMEM; tx->descs_cpu = dma_alloc_coherent(NULL, 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;