aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/files
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-09 18:51:07 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-09 18:51:07 +0200
commit2a08bf36565f94b2a329668b1c04a2b52e067477 (patch)
tree2c1fc88cd435a1ac16d523fa02640086ebb0fb2e /target/linux/ar71xx/files
parentb417a0c48d63dde16384fb38f6cc95f49299091a (diff)
downloadupstream-2a08bf36565f94b2a329668b1c04a2b52e067477.tar.gz
upstream-2a08bf36565f94b2a329668b1c04a2b52e067477.tar.bz2
upstream-2a08bf36565f94b2a329668b1c04a2b52e067477.zip
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 <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ar71xx/files')
-rw-r--r--target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c2
1 files changed, 1 insertions, 1 deletions
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;